Remove unneeded match and 'is in bounds' calculation

iced-rs · Nov 3, 2020 · f59ce87 · f59ce87
1 parent b1da5a4
commit f59ce87
Showing 1 changed file with 8 additions and 13 deletions.
diff --git a/native/src/widget/tooltip.rs b/native/src/widget/tooltip.rs
@@ -71,18 +71,13 @@ where
         renderer: &Renderer,
         clipboard: Option<&dyn Clipboard>,
     ) {
-        match event {
-            Event::Mouse(iced_core::mouse::Event::CursorMoved { x, y }) => {
-                self.state.cursor_position.x = x;
-                self.state.cursor_position.y = y;
-                if layout.bounds().contains(self.state.cursor_position) {
-                    self.state.is_hovered = true;
-                } else {
-                    self.state.is_hovered = false;
-                }
-            }
-            _ => (),
+        if layout.bounds().contains(cursor_position) {
+            self.state.cursor_position = cursor_position;
+            self.state.is_hovered = true;
+        } else {
+            self.state.is_hovered = false;
         }
+
         self.content.widget.on_event(
             event,
             layout,
@@ -119,9 +114,9 @@ where
 
     fn overlay(
         &mut self,
-        layout: Layout<'_>,
+        _layout: Layout<'_>,
     ) -> Option<overlay::Element<'_, Message, Renderer>> {
-        if layout.bounds().contains(self.state.cursor_position) {
+        if self.state.is_hovered {
             Some(overlay::Element::new(
                 self.state.cursor_position,
                 Box::new(Overlay::new(&self.hover_content)),