Update DropDown to 0.14

examples/drop_down.rs

@@ -14,11 +14,10 @@ use iced_aw::{drop_down, DropDown};
 
 fn main() -> iced::Result {
     iced::application(
-        "DropDown example",
+        DropDownExample::default,
         DropDownExample::update,
         DropDownExample::view,
     )
-    .font(iced_fonts::REQUIRED_FONT_BYTES)
     .run()
 }
 

src/widget/drop_down.rs

@@ -9,7 +9,6 @@ use iced::{
         widget::{Operation, Tree},
         Clipboard, Layout, Shell, Widget,
     },
-    event,
     keyboard::{self, key::Named},
     mouse::{self, Cursor},
     touch, Element, Event, Length, Point, Rectangle, Size, Vector,
@@ -149,18 +148,18 @@ where
             .operate(&mut state.children[0], layout, renderer, operation);
     }
 
-    fn on_event(
+    fn update(
         &mut self,
         state: &mut Tree,
-        event: Event,
+        event: &Event,
         layout: Layout<'_>,
         cursor: Cursor,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
         viewport: &Rectangle,
-    ) -> event::Status {
-        self.underlay.as_widget_mut().on_event(
+    ) {
+        self.underlay.as_widget_mut().update(
             &mut state.children[0],
             event,
             layout,
@@ -169,7 +168,7 @@ where
             clipboard,
             shell,
             viewport,
-        )
+        );
     }
 
     fn mouse_interaction(
@@ -192,15 +191,17 @@ where
     fn overlay<'b>(
         &'b mut self,
         state: &'b mut Tree,
-        layout: Layout<'_>,
+        layout: Layout<'b>,
         renderer: &Renderer,
+        viewport: &Rectangle,
         translation: Vector,
     ) -> Option<overlay::Element<'b, Message, Theme, Renderer>> {
         if !self.expanded {
             return self.underlay.as_widget_mut().overlay(
                 &mut state.children[0],
                 layout,
                 renderer,
+                viewport,
                 translation,
             );
         }
@@ -215,6 +216,7 @@ where
             &self.offset,
             layout.bounds(),
             layout.position() + translation,
+            *viewport,
         ))))
     }
 }
@@ -243,6 +245,7 @@ where
     offset: &'b Offset,
     underlay_bounds: Rectangle,
     position: Point,
+    viewport: Rectangle,
 }
 
 impl<'a, 'b, Message, Theme, Renderer> DropDownOverlay<'a, 'b, Message, Theme, Renderer>
@@ -261,6 +264,7 @@ where
         offset: &'b Offset,
         underlay_bounds: Rectangle,
         position: Point,
+        viewport: Rectangle,
     ) -> Self {
         DropDownOverlay {
             state,
@@ -272,6 +276,7 @@ where
             offset,
             underlay_bounds,
             position,
+            viewport,
         }
     }
 }
@@ -293,6 +298,7 @@ where
 
         let limits = {
             let max = limits.max();
+
             // Offset is computed from the reference rect, it isn't a translation vector.
             let width_before = self.underlay_bounds.x - self.offset.x;
             let width_after =
@@ -397,15 +403,15 @@ where
             .draw(self.state, renderer, theme, style, layout, cursor, &bounds);
     }
 
-    fn on_event(
+    fn update(
         &mut self,
-        event: Event,
+        event: &Event,
         layout: Layout<'_>,
         cursor: Cursor,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<Message>,
-    ) -> event::Status {
+    ) {
         if let Some(on_dismiss) = self.on_dismiss {
             match &event {
                 Event::Keyboard(keyboard::Event::KeyPressed { key, .. }) => {
@@ -427,7 +433,7 @@ where
             }
         }
 
-        self.element.as_widget_mut().on_event(
+        self.element.as_widget_mut().update(
             self.state,
             event,
             layout,
@@ -436,18 +442,21 @@ where
             clipboard,
             shell,
             &layout.bounds(),
-        )
+        );
     }
 
     fn mouse_interaction(
         &self,
         layout: Layout<'_>,
         cursor: Cursor,
-        viewport: &Rectangle,
         renderer: &Renderer,
     ) -> mouse::Interaction {
-        self.element
-            .as_widget()
-            .mouse_interaction(self.state, layout, cursor, viewport, renderer)
+        self.element.as_widget().mouse_interaction(
+            self.state,
+            layout,
+            cursor,
+            &self.viewport,
+            renderer,
+        )
     }
 }