dan/cushy
1
0
Fork 0
mirror of https://github.com/danbulant/cushy synced 2026-07-09 05:00:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing more edge cases around widget removal

Browse source
This commit is contained in:
Jonathan Johnson 2023-11-08 15:30:11 -08:00
parent ab4e4022ea
commit 6d41902002
No known key found for this signature in database
GPG key ID: A66D6A34D6620579
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/tree.rs
View file

@ -83,7 +83,7 @@ impl Tree {
pub(crate) fn layout(&self, widget: WidgetId) -> Option<Rect<Px>> { pub(crate) fn layout(&self, widget: WidgetId) -> Option<Rect<Px>> {
let data = self.data.lock().map_or_else(PoisonError::into_inner, |g| g); let data = self.data.lock().map_or_else(PoisonError::into_inner, |g| g);
data.nodes[&widget].layout data.nodes.get(&widget).and_then(|widget| widget.layout)
} }
pub(crate) fn reset_render_order(&self) { pub(crate) fn reset_render_order(&self) {
@ -259,7 +259,7 @@ impl Tree {
let data = self.data.lock().map_or_else(PoisonError::into_inner, |g| g); let data = self.data.lock().map_or_else(PoisonError::into_inner, |g| g);
let mut hits = Vec::new(); let mut hits = Vec::new();
for id in data.render_order.iter().rev() { for id in data.render_order.iter().rev() {
if let Some(last_rendered) = data.nodes[id].layout { if let Some(last_rendered) = data.nodes.get(id).and_then(|widget| widget.layout) {
if last_rendered.contains(point) { if last_rendered.contains(point) {
hits.push(ManagedWidget { hits.push(ManagedWidget {
widget: data.nodes[id].widget.clone(), widget: data.nodes[id].widget.clone(),
@ -377,8 +377,8 @@ impl TreeData {
new_widget, new_widget,
) { ) {
(Some(old_widget), Some(new_widget)) if old_widget == new_widget.id() => Err(()), (Some(old_widget), Some(new_widget)) if old_widget == new_widget.id() => Err(()),
(Some(old_widget), _) => Ok(Some(ManagedWidget { (Some(old_widget), _) => Ok(self.nodes.get(&old_widget).map(|node| ManagedWidget {
widget: self.nodes[&old_widget].widget.clone(), widget: node.widget.clone(),
tree: tree.clone(), tree: tree.clone(),
})), })),
(None, _) => Ok(None), (None, _) => Ok(None),