1 files changed, 14 insertions, 28 deletions

diff --git a/native/src/overlay/element.rs b/native/src/overlay/element.rs
index e1fd9b88..e4819037 100644
--- a/native/src/overlay/element.rs
+++ b/native/src/overlay/element.rs
@@ -1,10 +1,10 @@
 pub use crate::Overlay;
 
-use crate::{layout, Clipboard, Event, Hasher, Layout, Point, Size, Vector};
+use crate::event::{self, Event};
+use crate::layout;
+use crate::{Clipboard, Hasher, Layout, Point, Size, Vector};
 
 /// A generic [`Overlay`].
-///
-/// [`Overlay`]: trait.Overlay.html
 #[allow(missing_debug_implementations)]
 pub struct Element<'a, Message, Renderer> {
     position: Point,
@@ -16,9 +16,6 @@ where
     Renderer: crate::Renderer,
 {
     /// Creates a new [`Element`] containing the given [`Overlay`].
-    ///
-    /// [`Element`]: struct.Element.html
-    /// [`Overlay`]: trait.Overlay.html
     pub fn new(
         position: Point,
         overlay: Box<dyn Overlay<Message, Renderer> + 'a>,
@@ -27,16 +24,12 @@ where
     }
 
     /// Translates the [`Element`].
-    ///
-    /// [`Element`]: struct.Element.html
     pub fn translate(mut self, translation: Vector) -> Self {
         self.position = self.position + translation;
         self
     }
 
     /// Applies a transformation to the produced message of the [`Element`].
-    ///
-    /// [`Element`]: struct.Element.html
     pub fn map<B>(self, f: &'a dyn Fn(Message) -> B) -> Element<'a, B, Renderer>
     where
         Message: 'a,
@@ -50,38 +43,31 @@ where
     }
 
     /// Computes the layout of the [`Element`] in the given bounds.
-    ///
-    /// [`Element`]: struct.Element.html
     pub fn layout(&self, renderer: &Renderer, bounds: Size) -> layout::Node {
         self.overlay.layout(renderer, bounds, self.position)
     }
 
     /// Processes a runtime [`Event`].
-    ///
-    /// [`Event`]: enum.Event.html
     pub fn on_event(
         &mut self,
         event: Event,
         layout: Layout<'_>,
         cursor_position: Point,
-        messages: &mut Vec<Message>,
         renderer: &Renderer,
-        clipboard: Option<&dyn Clipboard>,
-    ) {
+        clipboard: &mut dyn Clipboard,
+        messages: &mut Vec<Message>,
+    ) -> event::Status {
         self.overlay.on_event(
             event,
             layout,
             cursor_position,
-            messages,
             renderer,
             clipboard,
+            messages,
         )
     }
 
     /// Draws the [`Element`] and its children using the given [`Layout`].
-    ///
-    /// [`Element`]: struct.Element.html
-    /// [`Layout`]: layout/struct.Layout.html
     pub fn draw(
         &self,
         renderer: &mut Renderer,
@@ -94,8 +80,6 @@ where
     }
 
     /// Computes the _layout_ hash of the [`Element`].
-    ///
-    /// [`Element`]: struct.Element.html
     pub fn hash_layout(&self, state: &mut Hasher) {
         self.overlay.hash_layout(state, self.position);
     }
@@ -133,24 +117,26 @@ where
         event: Event,
         layout: Layout<'_>,
         cursor_position: Point,
-        messages: &mut Vec<B>,
         renderer: &Renderer,
-        clipboard: Option<&dyn Clipboard>,
-    ) {
+        clipboard: &mut dyn Clipboard,
+        messages: &mut Vec<B>,
+    ) -> event::Status {
         let mut original_messages = Vec::new();
 
-        self.content.on_event(
+        let event_status = self.content.on_event(
             event,
             layout,
             cursor_position,
-            &mut original_messages,
             renderer,
             clipboard,
+            &mut original_messages,
         );
 
         original_messages
             .drain(..)
             .for_each(|message| messages.push((self.mapper)(message)));
+
+        event_status
     }
 
     fn draw(