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`

---
 widget/src/pane_grid/content.rs | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'widget/src/pane_grid/content.rs')

diff --git a/widget/src/pane_grid/content.rs b/widget/src/pane_grid/content.rs
index ec0676b1..81a5cc1e 100644
--- a/widget/src/pane_grid/content.rs
+++ b/widget/src/pane_grid/content.rs
@@ -1,12 +1,12 @@
 use crate::container;
-use crate::core::event::{self, Event};
 use crate::core::layout;
 use crate::core::mouse;
 use crate::core::overlay;
 use crate::core::renderer;
 use crate::core::widget::{self, Tree};
 use crate::core::{
-    self, Clipboard, Element, Layout, Point, Rectangle, Shell, Size, Vector,
+    self, Clipboard, Element, Event, Layout, Point, Rectangle, Shell, Size,
+    Vector,
 };
 use crate::pane_grid::{Draggable, TitleBar};
 
@@ -250,13 +250,11 @@ where
         shell: &mut Shell<'_, Message>,
         viewport: &Rectangle,
         is_picked: bool,
-    ) -> event::Status {
-        let mut event_status = event::Status::Ignored;
-
+    ) {
         let body_layout = if let Some(title_bar) = &mut self.title_bar {
             let mut children = layout.children();
 
-            event_status = title_bar.on_event(
+            title_bar.on_event(
                 &mut tree.children[1],
                 event.clone(),
                 children.next().unwrap(),
@@ -272,9 +270,7 @@ where
             layout
         };
 
-        let body_status = if is_picked {
-            event::Status::Ignored
-        } else {
+        if !is_picked {
             self.body.as_widget_mut().on_event(
                 &mut tree.children[0],
                 event,
@@ -284,10 +280,8 @@ where
                 clipboard,
                 shell,
                 viewport,
-            )
-        };
-
-        event_status.merge(body_status)
+            );
+        }
     }
 
     pub(crate) fn mouse_interaction(
-- 
cgit 


From f02bfc3f68322bea0c56283d76888714be401ec2 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Fri, 25 Oct 2024 22:06:06 +0200
Subject: Rename `Widget::on_event` to `update`

---
 widget/src/pane_grid/content.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'widget/src/pane_grid/content.rs')

diff --git a/widget/src/pane_grid/content.rs b/widget/src/pane_grid/content.rs
index 81a5cc1e..e0199f0a 100644
--- a/widget/src/pane_grid/content.rs
+++ b/widget/src/pane_grid/content.rs
@@ -271,7 +271,7 @@ where
         };
 
         if !is_picked {
-            self.body.as_widget_mut().on_event(
+            self.body.as_widget_mut().update(
                 &mut tree.children[0],
                 event,
                 body_layout,
-- 
cgit 


From 4e47450c336a235fe26090665aca1cc7b4d23384 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 29 Oct 2024 15:55:47 +0100
Subject: Implement `reactive-rendering` for `pane_grid`

---
 widget/src/pane_grid/content.rs | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'widget/src/pane_grid/content.rs')

diff --git a/widget/src/pane_grid/content.rs b/widget/src/pane_grid/content.rs
index e0199f0a..f1f67023 100644
--- a/widget/src/pane_grid/content.rs
+++ b/widget/src/pane_grid/content.rs
@@ -284,6 +284,31 @@ where
         }
     }
 
+    pub(crate) fn grid_interaction(
+        &self,
+        layout: Layout<'_>,
+        cursor: mouse::Cursor,
+        drag_enabled: bool,
+    ) -> Option<mouse::Interaction> {
+        let title_bar = self.title_bar.as_ref()?;
+
+        let mut children = layout.children();
+        let title_bar_layout = children.next().unwrap();
+
+        let is_over_pick_area = cursor
+            .position()
+            .map(|cursor_position| {
+                title_bar.is_over_pick_area(title_bar_layout, cursor_position)
+            })
+            .unwrap_or_default();
+
+        if is_over_pick_area && drag_enabled {
+            return Some(mouse::Interaction::Grab);
+        }
+
+        None
+    }
+
     pub(crate) fn mouse_interaction(
         &self,
         tree: &Tree,
-- 
cgit 


From e5f1e31a5c068fe992cab076661cb6e2d120bdf1 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Wed, 6 Nov 2024 00:02:46 +0100
Subject: Rename `Overlay::on_event` to `update`

---
 widget/src/pane_grid/content.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'widget/src/pane_grid/content.rs')

diff --git a/widget/src/pane_grid/content.rs b/widget/src/pane_grid/content.rs
index f1f67023..fa9f7a9f 100644
--- a/widget/src/pane_grid/content.rs
+++ b/widget/src/pane_grid/content.rs
@@ -239,7 +239,7 @@ where
         );
     }
 
-    pub(crate) fn on_event(
+    pub(crate) fn update(
         &mut self,
         tree: &mut Tree,
         event: Event,
@@ -254,7 +254,7 @@ where
         let body_layout = if let Some(title_bar) = &mut self.title_bar {
             let mut children = layout.children();
 
-            title_bar.on_event(
+            title_bar.update(
                 &mut tree.children[1],
                 event.clone(),
                 children.next().unwrap(),
-- 
cgit