me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "fix: prevent building overlay with stale layout"

Browse source 
This reverts commit 3be8f6e989.
This commit is contained in:
Héctor Ramón Jiménez 2022-05-13 18:45:03 +02:00
parent 3be8f6e989
commit 4c98de0a53
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
2 changed files with 13 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

40
lazy/src/pure/component.rs
View file

@ -415,35 +415,6 @@ where
let mut local_messages = Vec::new();
let mut local_shell = Shell::new(&mut local_messages);
if self
.overlay
.as_ref()
.and_then(|overlay| overlay.borrow_overlay().as_ref())
.is_none()
{
let overlay = self.overlay.take().unwrap().into_heads();
self.overlay = Some(
OverlayBuilder {
instance: overlay.instance,
instance_ref_builder: |instance| instance.state.borrow(),
tree: overlay.tree,
types: PhantomData,
overlay_builder: |instance, tree| {
instance
.as_ref()
.unwrap()
.borrow_element()
.as_ref()
.unwrap()
.as_widget()
.overlay(&mut tree.children[0], layout, renderer)
},
}
.build(),
);
}
let event_status = self
.with_overlay_mut_maybe(|overlay| {
overlay.on_event(
@ -493,7 +464,16 @@ where
instance_ref_builder: |instance| instance.state.borrow(),
tree: overlay.tree,
types: PhantomData,
overlay_builder: |_, _| None,
overlay_builder: |instance, tree| {
instance
.as_ref()
.unwrap()
.borrow_element()
.as_ref()
.unwrap()
.as_widget()
.overlay(&mut tree.children[0], layout, renderer)
},
}
.build(),
);