Rename method to is_over

examples/toast/src/main.rs

@@ -652,11 +652,7 @@ mod toast {
                 .unwrap_or_default()
         }
 
-        fn contains_cursor(
+        fn is_over(&self, layout: Layout<'_>, cursor_position: Point) -> bool {
-            &self,
-            layout: Layout<'_>,
-            cursor_position: Point,
-        ) -> bool {
             layout
                 .children()
                 .any(|layout| layout.bounds().contains(cursor_position))

native/src/overlay.rs

@@ -90,12 +90,8 @@ where
         mouse::Interaction::Idle
     }
 
-    /// Whether the [`Overlay`] contains the cursor
+    /// Returns true if the cursor is over the [`Overlay`]
-    fn contains_cursor(
+    fn is_over(&self, layout: Layout<'_>, cursor_position: Point) -> bool {
-        &self,
-        layout: Layout<'_>,
-        cursor_position: Point,
-    ) -> bool {
         layout.bounds().contains(cursor_position)
     }
 }

native/src/overlay/element.rs

@@ -116,13 +116,9 @@ where
         self.overlay.operate(layout, renderer, operation);
     }
 
-    /// Whether the [`Overlay`] contains the cursor
+    /// Returns true if the cursor is over the [`Element`]
-    pub fn contains_cursor(
+    pub fn is_over(&self, layout: Layout<'_>, cursor_position: Point) -> bool {
-        &self,
+        self.overlay.is_over(layout, cursor_position)
-        layout: Layout<'_>,
-        cursor_position: Point,
-    ) -> bool {
-        self.overlay.contains_cursor(layout, cursor_position)
     }
 }
 
@@ -262,11 +258,7 @@ where
             .draw(renderer, theme, style, layout, cursor_position)
     }
 
-    fn contains_cursor(
+    fn is_over(&self, layout: Layout<'_>, cursor_position: Point) -> bool {
-        &self,
+        self.content.is_over(layout, cursor_position)
-        layout: Layout<'_>,
-        cursor_position: Point,
-    ) -> bool {
-        self.content.contains_cursor(layout, cursor_position)
     }
 }

native/src/overlay/group.rs

@@ -152,17 +152,11 @@ where
         });
     }
 
-    fn contains_cursor(
+    fn is_over(&self, layout: Layout<'_>, cursor_position: Point) -> bool {
-        &self,
-        layout: Layout<'_>,
-        cursor_position: Point,
-    ) -> bool {
         self.children
             .iter()
             .zip(layout.children())
-            .any(|(child, layout)| {
+            .any(|(child, layout)| child.is_over(layout, cursor_position))
-                child.contains_cursor(layout, cursor_position)
-            })
     }
 }
 

native/src/user_interface.rs

@@ -264,7 +264,7 @@ where
             let base_cursor = if manual_overlay
                 .as_ref()
                 .unwrap()
-                .contains_cursor(Layout::new(&layout), cursor_position)
+                .is_over(Layout::new(&layout), cursor_position)
             {
                 // TODO: Type-safe cursor availability
                 Point::new(-1.0, -1.0)
@@ -508,10 +508,8 @@ where
                             );
                         });
 
-                        if overlay.contains_cursor(
+                        if overlay.is_over(Layout::new(layout), cursor_position)
-                            Layout::new(layout),
+                        {
-                            cursor_position,
-                        ) {
                             overlay_interaction
                         } else {
                             base_interaction