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/status_bar.rs
+3 -3
View File
@@ -83,7 +83,7 @@ impl<S: 'static + Send + Sync + Clone> StatusBar<S> {
self
}
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()
@@ -98,7 +98,7 @@ impl<S: 'static + Send + Sync + Clone> StatusBar<S> {
.child(self.right_tools(&theme))
}
fn left_tools(&self, theme: &Theme) -> impl Element<State = S> {
fn left_tools(&self, theme: &Theme) -> impl Element<ViewState = S> {
let workspace_state = get_workspace_state();
div()
@@ -129,7 +129,7 @@ impl<S: 'static + Send + Sync + Clone> StatusBar<S> {
.child(IconButton::new(Icon::XCircle))
}
fn right_tools(&self, theme: &Theme) -> impl Element<State = S> {
fn right_tools(&self, theme: &Theme) -> impl Element<ViewState = S> {
let workspace_state = get_workspace_state();
div()