oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reconcile with upstream changes

Browse Source
This commit is contained in:
Marshall Bowers
2023-10-12 10:40:47 -04:00
parent 9581279919
commit 8cd112110e
44 changed files with 112 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ui2/src/components/keybinding.rs
+3 -3
View File
@@ -35,7 +35,7 @@ impl<S: 'static + Send + Sync + Clone> Keybinding<S> {
}
}
fn render(&mut self, cx: &mut ViewContext<S>) -> impl Element<State = S> {
fn render(&mut self, cx: &mut ViewContext<S>) -> impl Element<ViewState = S> {
div()
.flex()
.gap_2()
@@ -72,7 +72,7 @@ impl<S: 'static + Send + Sync> Key<S> {
}
}
fn render(&mut self, cx: &mut ViewContext<S>) -> impl Element<State = S> {
fn render(&mut self, cx: &mut ViewContext<S>) -> impl Element<ViewState = S> {
let theme = theme(cx);
div()
@@ -189,7 +189,7 @@ mod stories {
}
}
fn render(&mut self, cx: &mut ViewContext<S>) -> impl Element<State = S> {
fn render(&mut self, cx: &mut ViewContext<S>) -> impl Element<ViewState = S> {
let all_modifier_permutations = ModifierKey::iter().permutations(2);
Story::container(cx)