wip: provide WidgetRef to Widget::get_child_at_pos

linebender · Aug 30, 2024 · be65d65 · be65d65
1 parent 50768e1
commit be65d65
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/masonry/src/widget/widget.rs b/masonry/src/widget/widget.rs
@@ -179,10 +179,11 @@ pub trait Widget: AsAny {
     /// [`Self::children_ids`].
     fn get_child_at_pos<'w>(
         &self,
-        children: &[WidgetRef<'w, dyn Widget>],
+        widget_ref: WidgetRef<'w, dyn Widget>,
         pos: Point,
     ) -> Option<WidgetRef<'w, dyn Widget>> {
-        children
+        widget_ref
+            .children()
             .iter()
             // TODO: currently assumes `Self::children_ids` is in increasing "z-order". Picks the
             // last child in case of overlapping children. Is this the desired behavior?
@@ -367,10 +368,10 @@ impl Widget for Box<dyn Widget> {
 
     fn get_child_at_pos<'w>(
         &self,
-        children: &[WidgetRef<'w, dyn Widget>],
+        widget_ref: WidgetRef<'w, dyn Widget>,
         pos: Point,
     ) -> Option<WidgetRef<'w, dyn Widget>> {
-        self.deref().get_child_at_pos(children, pos)
+        self.deref().get_child_at_pos(widget_ref, pos)
     }
 
     fn as_any(&self) -> &dyn Any {

diff --git a/masonry/src/widget/widget_ref.rs b/masonry/src/widget/widget_ref.rs
@@ -191,7 +191,7 @@ impl<'w> WidgetRef<'w, dyn Widget> {
 
             if let Some(child) = innermost_widget
                 .widget
-                .get_child_at_pos(&innermost_widget.children(), pos)
+                .get_child_at_pos(innermost_widget, pos)
             {
                 innermost_widget = child;
             } else {