From 3f968b8c876b7c2351232856887fb9c3e3db3130 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 12 Nov 2020 00:09:52 +0100
Subject: Make `Widget::on_event` return an `event::Status`

---
 native/src/widget/column.rs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'native/src/widget/column.rs')

diff --git a/native/src/widget/column.rs b/native/src/widget/column.rs
index e874ad42..425bd33f 100644
--- a/native/src/widget/column.rs
+++ b/native/src/widget/column.rs
@@ -1,11 +1,11 @@
 //! Distribute content vertically.
 use std::hash::Hash;
 
+use crate::event::{self, Event};
 use crate::layout;
 use crate::overlay;
 use crate::{
-    Align, Clipboard, Element, Event, Hasher, Layout, Length, Point, Rectangle,
-    Widget,
+    Align, Clipboard, Element, Hasher, Layout, Length, Point, Rectangle, Widget,
 };
 
 use std::u32;
@@ -162,19 +162,21 @@ where
         messages: &mut Vec<Message>,
         renderer: &Renderer,
         clipboard: Option<&dyn Clipboard>,
-    ) {
+    ) -> event::Status {
         self.children.iter_mut().zip(layout.children()).for_each(
             |(child, layout)| {
-                child.widget.on_event(
+                let _ = child.widget.on_event(
                     event.clone(),
                     layout,
                     cursor_position,
                     messages,
                     renderer,
                     clipboard,
-                )
+                );
             },
         );
+
+        event::Status::Ignored
     }
 
     fn draw(
-- 
cgit 


From 3bcee62beb36d9e186d8716c7660433fac071ed6 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 12 Nov 2020 00:30:06 +0100
Subject: Implement event capturing for `Column`

---
 native/src/widget/column.rs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'native/src/widget/column.rs')

diff --git a/native/src/widget/column.rs b/native/src/widget/column.rs
index 425bd33f..42a9e734 100644
--- a/native/src/widget/column.rs
+++ b/native/src/widget/column.rs
@@ -163,20 +163,20 @@ where
         renderer: &Renderer,
         clipboard: Option<&dyn Clipboard>,
     ) -> event::Status {
-        self.children.iter_mut().zip(layout.children()).for_each(
-            |(child, layout)| {
-                let _ = child.widget.on_event(
+        self.children
+            .iter_mut()
+            .zip(layout.children())
+            .map(|(child, layout)| {
+                child.widget.on_event(
                     event.clone(),
                     layout,
                     cursor_position,
                     messages,
                     renderer,
                     clipboard,
-                );
-            },
-        );
-
-        event::Status::Ignored
+                )
+            })
+            .fold(event::Status::Ignored, event::Status::merge)
     }
 
     fn draw(
-- 
cgit