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/tab.rs
View file

@ -74,7 +74,7 @@ impl<S: 'static + Send + Sync + Clone> Tab<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);
let has_fs_conflict = self.fs_status == FileSystemStatus::Conflict;
let is_deleted = self.fs_status == FileSystemStatus::Deleted;
@ -157,7 +157,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 git_statuses = GitStatus::iter();
let fs_statuses = FileSystemStatus::iter();