From 752403d70c851ece620c4007710062b158e8dec3 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Fri, 25 Oct 2024 15:40:05 +0200
Subject: Split `Shell::request_redraw` into two different methods

---
 core/src/shell.rs | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'core/src/shell.rs')

diff --git a/core/src/shell.rs b/core/src/shell.rs
index 2952ceff..7a92a2be 100644
--- a/core/src/shell.rs
+++ b/core/src/shell.rs
@@ -1,3 +1,4 @@
+use crate::time::Instant;
 use crate::window;
 
 /// A connection to the state of a shell.
@@ -35,14 +36,19 @@ impl<'a, Message> Shell<'a, Message> {
         self.messages.push(message);
     }
 
-    /// Requests a new frame to be drawn.
-    pub fn request_redraw(&mut self, request: window::RedrawRequest) {
+    /// Requests a new frame to be drawn as soon as possible.
+    pub fn request_redraw(&mut self) {
+        self.redraw_request = Some(window::RedrawRequest::NextFrame);
+    }
+
+    /// Requests a new frame to be drawn at the given [`Instant`].
+    pub fn request_redraw_at(&mut self, at: Instant) {
         match self.redraw_request {
             None => {
-                self.redraw_request = Some(request);
+                self.redraw_request = Some(window::RedrawRequest::At(at));
             }
-            Some(current) if request < current => {
-                self.redraw_request = Some(request);
+            Some(window::RedrawRequest::At(current)) if at < current => {
+                self.redraw_request = Some(window::RedrawRequest::At(at));
             }
             _ => {}
         }
@@ -95,8 +101,12 @@ impl<'a, Message> Shell<'a, Message> {
     pub fn merge<B>(&mut self, other: Shell<'_, B>, f: impl Fn(B) -> Message) {
         self.messages.extend(other.messages.drain(..).map(f));
 
-        if let Some(at) = other.redraw_request {
-            self.request_redraw(at);
+        if let Some(new) = other.redraw_request {
+            self.redraw_request = Some(
+                self.redraw_request
+                    .map(|current| if current < new { current } else { new })
+                    .unwrap_or(new),
+            );
         }
 
         self.is_layout_invalid =
-- 
cgit 


From dcc184b01b753dbecb500205391f6eaaa21c8683 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Fri, 25 Oct 2024 19:28:18 +0200
Subject: Replace `event::Status` in `Widget::on_event` with
 `Shell::capture_event`

---
 core/src/shell.rs | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'core/src/shell.rs')

diff --git a/core/src/shell.rs b/core/src/shell.rs
index 7a92a2be..12ebbaa8 100644
--- a/core/src/shell.rs
+++ b/core/src/shell.rs
@@ -1,3 +1,4 @@
+use crate::event;
 use crate::time::Instant;
 use crate::window;
 
@@ -10,6 +11,7 @@ use crate::window;
 #[derive(Debug)]
 pub struct Shell<'a, Message> {
     messages: &'a mut Vec<Message>,
+    event_status: event::Status,
     redraw_request: Option<window::RedrawRequest>,
     is_layout_invalid: bool,
     are_widgets_invalid: bool,
@@ -20,6 +22,7 @@ impl<'a, Message> Shell<'a, Message> {
     pub fn new(messages: &'a mut Vec<Message>) -> Self {
         Self {
             messages,
+            event_status: event::Status::Ignored,
             redraw_request: None,
             is_layout_invalid: false,
             are_widgets_invalid: false,
@@ -36,6 +39,24 @@ impl<'a, Message> Shell<'a, Message> {
         self.messages.push(message);
     }
 
+    /// Marks the current event as captured. Prevents "event bubbling".
+    ///
+    /// A widget should capture an event when no ancestor should
+    /// handle it.
+    pub fn capture_event(&mut self) {
+        self.event_status = event::Status::Captured;
+    }
+
+    /// Returns the current [`event::Status`] of the [`Shell`].
+    pub fn event_status(&self) -> event::Status {
+        self.event_status
+    }
+
+    /// Returns whether the current event has been captured.
+    pub fn is_event_captured(&self) -> bool {
+        self.event_status == event::Status::Captured
+    }
+
     /// Requests a new frame to be drawn as soon as possible.
     pub fn request_redraw(&mut self) {
         self.redraw_request = Some(window::RedrawRequest::NextFrame);
@@ -114,5 +135,7 @@ impl<'a, Message> Shell<'a, Message> {
 
         self.are_widgets_invalid =
             self.are_widgets_invalid || other.are_widgets_invalid;
+
+        self.event_status = self.event_status.merge(other.event_status);
     }
 }
-- 
cgit