Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

4
crates/ui2/src/components/workspace.rs
View file

@ -125,7 +125,7 @@ impl<S: 'static + Send + Sync + Clone> WorkspaceElement<S> {
}
}
pub fn render(&mut self, cx: &mut ViewContext<S>) -> impl Element<State = S> {
pub fn render(&mut self, cx: &mut ViewContext<S>) -> impl Element<ViewState = S> {
let theme = theme(cx).clone();
let workspace_state = get_workspace_state();
@ -353,7 +353,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> {
// Just render the workspace without any story boilerplate.
WorkspaceElement::new()
}