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

Merge branch 'remove-view-state-associated-type' into gpui2-element-renderer

Browse source
This commit is contained in:
Marshall Bowers 2023-10-26 10:10:17 +02:00
commit e31a9401a8
58 changed files with 240 additions and 305 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/ui2/src/components/panes.rs
View file

@ -118,7 +118,7 @@ impl<S: 'static + Send + Sync> Pane<S> {
self
}
fn render(&mut self, view: &mut S, cx: &mut ViewContext<S>) -> impl Element<ViewState = S> {
fn render(&mut self, view: &mut S, cx: &mut ViewContext<S>) -> impl Element<S> {
div()
.id(self.id.clone())
.flex()
@ -148,8 +148,8 @@ impl<S: 'static + Send + Sync> Pane<S> {
}
}
impl<S: 'static + Send + Sync> ParentElement for Pane<S> {
fn children_mut(&mut self) -> &mut SmallVec<[AnyElement<Self::ViewState>; 2]> {
impl<S: 'static + Send + Sync> ParentElement<S> for Pane<S> {
fn children_mut(&mut self) -> &mut SmallVec<[AnyElement<S>; 2]> {
&mut self.children
}
}
@ -181,7 +181,7 @@ impl<S: 'static + Send + Sync> PaneGroup<S> {
}
}
fn render(&mut self, view: &mut S, cx: &mut ViewContext<S>) -> impl Element<ViewState = S> {
fn render(&mut self, view: &mut S, cx: &mut ViewContext<S>) -> impl Element<S> {
let theme = theme(cx);
if !self.panes.is_empty() {