Bump understory and fix #1052

Cargo.toml

@@ -114,11 +114,11 @@ fluent-bundle = { version = "0.16", optional = true }
 unic-langid = { version = "0.9", optional = true }
 sys-locale = { version = "0.3.2", optional = true }
 ouroboros = { version = "0.18", optional = true }
-understory_box_tree = { git = "https://github.com/jrmoulton/understory", rev = "3acd6cde8c5c", package = "understory_box_tree" }
-understory_event_state = { git = "https://github.com/jrmoulton/understory", rev = "3acd6cde8c5c", package = "understory_event_state" }
-understory_index = { git = "https://github.com/jrmoulton/understory", rev = "3acd6cde8c5c", package = "understory_index" }
-understory_focus = { git = "https://github.com/jrmoulton/understory", rev = "3acd6cde8c5c", package = "understory_focus" }
-understory_virtual_list = { git = "https://github.com/jrmoulton/understory", rev = "3acd6cde8c5c", package = "understory_virtual_list" }
+understory_box_tree = { git = "https://github.com/jrmoulton/understory", rev = "2c2abb8c4bd9", package = "understory_box_tree" }
+understory_event_state = { git = "https://github.com/jrmoulton/understory", rev = "2c2abb8c4bd9", package = "understory_event_state" }
+understory_index = { git = "https://github.com/jrmoulton/understory", rev = "2c2abb8c4bd9", package = "understory_index" }
+understory_focus = { git = "https://github.com/jrmoulton/understory", rev = "2c2abb8c4bd9", package = "understory_focus" }
+understory_virtual_list = { git = "https://github.com/jrmoulton/understory", rev = "2c2abb8c4bd9", package = "understory_virtual_list" }
 
 [target.'cfg(any(target_os = "windows", target_os = "macos"))'.dependencies]
 muda = { workspace = true }

src/event/dispatch.rs

@@ -834,7 +834,7 @@ impl RouteCx<'_, '_> {
             .window_state
             .box_tree
             .borrow_mut()
-            .get_or_compute_world_transform(dispatch_step.target_element_id.0)
+            .world_transform(dispatch_step.target_element_id.0)
         else {
             // we are storing pending events so it's possible that a node becomes stale. if it
             // did, don't panic, just continue.
@@ -1265,7 +1265,7 @@ impl RouteCx<'_, '_> {
                     .window_state
                     .box_tree
                     .borrow_mut()
-                    .get_or_compute_world_bounds(hit.owning_id().get_element_id().0)
+                    .world_bounds(hit.owning_id().get_element_id().0)
                     .unwrap_or_default();
                 let bottom_left = Point::new(bounds.x0, bounds.y1);
                 show_context_menu(menu(), Some(bottom_left));

src/event/drag_state.rs

@@ -421,7 +421,7 @@ impl DragTracker {
                 // Calculate percentage based on custom_pct or initial click position
                 // Get world bounds at drag start to know where user clicked
                 let start_world_bounds = box_tree
-                    .get_or_compute_world_bounds(pending.element_id.0)
+                    .world_bounds(pending.element_id.0)
                     .expect("drag source went stale during threshold check");
 
                 let click_offset_x = start_pos.x - start_world_bounds.x0;

src/paint/mod.rs

@@ -162,7 +162,7 @@ pub(crate) fn collect_visual_order(
         }
 
         box_tree
-            .get_or_compute_world_bounds(element_id.0)
+            .world_bounds(element_id.0)
             .is_none_or(|bounds| bounds.area() != 0.0)
     };
 
@@ -275,10 +275,8 @@ impl GlobalPaintCx<'_> {
     /// Paint a single visual node with its absolute transform
     pub(crate) fn paint_visual_node(&mut self, element_id: ElementId, is_post: bool) {
         // Get state from box tree for this visual node
-        let mut box_tree = self.window_state.box_tree.borrow_mut();
-        let world_transform = box_tree
-            .get_or_compute_world_transform(element_id.0)
-            .unwrap_or_default();
+        let box_tree = self.window_state.box_tree.borrow_mut();
+        let world_transform = box_tree.world_transform(element_id.0).unwrap_or_default();
         let layout_rect_local = box_tree.local_bounds(element_id.0).unwrap_or_default();
         let clip = box_tree.clipped_local_clip(element_id.0);
         drop(box_tree);

src/view/id.rs

@@ -598,7 +598,7 @@ impl ViewId {
         VIEW_STORAGE.with_borrow_mut(|s| {
             s.box_tree(*self)
                 .borrow_mut()
-                .get_or_compute_world_transform(element_id.0)
+                .world_transform(element_id.0)
                 .unwrap_or_default()
         })
     }
@@ -613,7 +613,7 @@ impl ViewId {
         VIEW_STORAGE.with_borrow_mut(|s| {
             s.box_tree(*self)
                 .borrow_mut()
-                .get_or_compute_world_bounds(element_id.0)
+                .world_bounds(element_id.0)
                 .unwrap_or_default()
         })
     }
@@ -641,7 +641,7 @@ impl ViewId {
             .with_borrow_mut(|s| {
                 s.box_tree(*self)
                     .borrow_mut()
-                    .get_or_compute_world_bounds(element_id.0)
+                    .world_bounds(element_id.0)
                     .unwrap_or_default()
             })
             .origin()
@@ -784,7 +784,7 @@ impl ViewId {
         let element_id = self.get_element_id();
         VIEW_STORAGE.with_borrow_mut(|s| {
             let box_tree = s.box_tree(*self);
-            box_tree.borrow_mut().set_local_clip(element_id.0, clip)
+            box_tree.borrow_mut().set_local_clip(element_id.0, clip);
         })
     }
 
@@ -1398,7 +1398,7 @@ impl ViewId {
         VIEW_STORAGE.with_borrow_mut(|s| {
             s.box_tree(*self)
                 .borrow_mut()
-                .get_or_compute_world_transform(element_id.0)
+                .world_transform(element_id.0)
                 .unwrap_or_default()
                 * Point::ZERO
         })

src/views/scroll.rs

@@ -799,7 +799,7 @@ impl Scroll {
     fn do_scroll_to_element(&mut self, scroll_to: ScrollTo) -> EventPropagation {
         let child_element_id = self.child.get_element_id();
         let box_tree = self.id.box_tree();
-        let mut box_tree = box_tree.borrow_mut();
+        let box_tree = box_tree.borrow();
 
         let Some(target_local_rect) = scroll_to
             .rect
@@ -809,10 +809,10 @@ impl Scroll {
         };
 
         let target_transform = box_tree
-            .get_or_compute_world_transform(scroll_to.id.0)
+            .world_transform(scroll_to.id.0)
             .unwrap_or(Affine::IDENTITY);
         let child_transform = box_tree
-            .get_or_compute_world_transform(child_element_id.0)
+            .world_transform(child_element_id.0)
             .unwrap_or(Affine::IDENTITY);
 
         let target_world_rect = target_transform.transform_rect_bbox(target_local_rect);

src/window/state.rs

@@ -953,7 +953,7 @@ impl WindowState {
             let current_transform = self
                 .box_tree
                 .borrow_mut()
-                .get_or_compute_world_transform(dragging_preview.element_id.0)
+                .world_transform(dragging_preview.element_id.0)
                 .unwrap_or(Affine::IDENTITY);
 
             let natural_position = dragging.update_and_get_natural_position(current_transform);
@@ -996,13 +996,20 @@ impl WindowState {
             self.drag_tracker.active_drag = None;
         }
 
+        let mut dirty_rects = Vec::new();
+
+        // Understory now exposes only last-committed world transforms while dirty.
+        // Commit once to refresh layout-derived parent world transforms before applying
+        // overlay/fixed corrections that depend on them, then commit the corrected state.
+        dirty_rects.extend(self.box_tree.borrow_mut().commit().dirty_rects);
+
         self.apply_overlay_parent_transforms();
         self.apply_fixed_positioning_transforms();
 
-        let damage = self.box_tree.borrow_mut().commit();
+        dirty_rects.extend(self.box_tree.borrow_mut().commit().dirty_rects);
 
         let pointer = self.last_pointer;
-        for damage_rect in &damage.dirty_rects {
+        for damage_rect in &dirty_rects {
             if damage_rect.contains(pointer.0) {
                 clear_hit_test_cache();
                 let root_element_id = self.root_view_id.get_element_id();
@@ -1014,7 +1021,7 @@ impl WindowState {
                 .route_window_event();
             }
         }
-        if !damage.dirty_rects.is_empty() {
+        if !dirty_rects.is_empty() {
             self.invalidate_focus_nav_cache();
             self.request_paint = true;
         }
@@ -1093,7 +1100,7 @@ impl WindowState {
         let mut tree = self.box_tree.borrow_mut();
         for (overlay_element_id, logical_parent_element_id, base_local_transform) in overlay_data {
             let parent_world = tree
-                .get_or_compute_world_transform(logical_parent_element_id.0)
+                .world_transform(logical_parent_element_id.0)
                 .unwrap_or(Affine::IDENTITY);
             tree.set_local_transform(overlay_element_id.0, parent_world * base_local_transform);
         }

test/tests/fixed_positioning.rs

@@ -1185,10 +1185,14 @@ fn test_fixed_overlay_with_non_fixed_sibling() {
             clicked1_clone.set(true);
         });
 
+    use floem::View;
+    let id = fixed1.id();
+
     // Non-fixed element at (300, 200) - this should NOT block the fixed element
     let non_fixed2 = Empty::new()
         .style(|s| s.background(BLUE).size(50.0, 50.0))
         .action(|| {});
+    let id2 = non_fixed2.id();
 
     let view = Stack::new((
         // First overlay with fixed child
@@ -1209,6 +1213,9 @@ fn test_fixed_overlay_with_non_fixed_sibling() {
     .style(|s| s.size(400.0, 300.0));
 
     let mut harness = HeadlessHarness::new_with_size(root, view, 400.0, 300.0);
+    harness.rebuild();
+    dbg!(id.get_visual_rect());
+    dbg!(id2.get_visual_rect());
 
     // Click at (35, 35) should hit the fixed element
     harness.click(35.0, 35.0);