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

Replace derive Element with derive IntoAnyElement everywhere

Browse source
This commit is contained in:
Nathan Sobo 2023-10-26 12:38:23 +02:00
parent 315744ec20
commit 8ecfea55cd
45 changed files with 185 additions and 292 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -75,7 +75,7 @@ impl<V: 'static> ParentElement<V> for Pane<V> {
}
}
#[derive(Element)]
#[derive(IntoAnyElement)]
pub struct PaneGroup<V: 'static + Send + Sync> {
state_type: PhantomData<V>,
groups: Vec<PaneGroup<V>>,
@ -102,7 +102,7 @@ impl<V: 'static + Send + Sync> PaneGroup<V> {
}
}
fn render(&mut self, view: &mut V, cx: &mut ViewContext<V>) -> impl IntoAnyElement<V> {
fn render(mut self, view: &mut V, cx: &mut ViewContext<V>) -> impl IntoAnyElement<V> {
let theme = theme(cx);
if !self.panes.is_empty() {
@ -129,7 +129,7 @@ impl<V: 'static + Send + Sync> PaneGroup<V> {
.w_full()
.h_full()
.bg(theme.editor)
.children(self.groups.iter_mut().map(|group| group.render(view, cx)));
.children(self.groups.drain(..).map(|group| group.render(view, cx)));
if self.split_direction == SplitDirection::Horizontal {
return el;