Implement `Widget::mouse_interaction` for `PaneGrid`

... and fix rendering of drag interaction in `PaneGrid` by
introducing an explicit `with_translation` method to `Renderer`
and simplifying the `with_layer` and `Clip` primitive.

5 files changed, 126 insertions, 30 deletions

diff --git a/native/src/widget/pane_grid.rs b/native/src/widget/pane_grid.rs
index cb386959..5f0e73e4 100644
--- a/native/src/widget/pane_grid.rs
+++ b/native/src/widget/pane_grid.rs
@@ -471,6 +471,33 @@ where
             .fold(event_status, event::Status::merge)
     }
 
+    fn mouse_interaction(
+        &self,
+        layout: Layout<'_>,
+        viewport: &Rectangle,
+        cursor_position: Point,
+    ) -> mouse::Interaction {
+        if self.state.picked_pane().is_some() {
+            return mouse::Interaction::Grab;
+        }
+
+        if let Some((_, axis)) = self.state.picked_split() {
+            return match axis {
+                Axis::Horizontal => mouse::Interaction::ResizingHorizontally,
+                Axis::Vertical => mouse::Interaction::ResizingVertically,
+            };
+        }
+
+        self.elements
+            .iter()
+            .zip(layout.children())
+            .map(|((_pane, content), layout)| {
+                content.mouse_interaction(layout, viewport, cursor_position)
+            })
+            .max()
+            .unwrap_or_default()
+    }
+
     fn draw(
         &self,
         renderer: &mut Renderer,
@@ -543,22 +570,22 @@ where
                 Some((dragging, origin)) if *id == dragging => {
                     let bounds = layout.bounds();
 
-                    renderer.with_layer(
-                        Rectangle {
-                            x: cursor_position.x - origin.x,
-                            y: cursor_position.y - origin.y,
-                            width: bounds.width + 0.5,
-                            height: bounds.height + 0.5,
-                        },
-                        Vector::new(0, 0),
+                    renderer.with_translation(
+                        cursor_position
+                            - Point::new(
+                                bounds.x + origin.x,
+                                bounds.y + origin.y,
+                            ),
                         |renderer| {
-                            pane.draw(
-                                renderer,
-                                style,
-                                layout,
-                                pane_cursor_position,
-                                viewport,
-                            );
+                            renderer.with_layer(bounds, |renderer| {
+                                pane.draw(
+                                    renderer,
+                                    style,
+                                    layout,
+                                    pane_cursor_position,
+                                    viewport,
+                                );
+                            });
                         },
                     );
                 }
diff --git a/native/src/widget/pane_grid/content.rs b/native/src/widget/pane_grid/content.rs
index e74e3c84..ddc659cc 100644
--- a/native/src/widget/pane_grid/content.rs
+++ b/native/src/widget/pane_grid/content.rs
@@ -1,6 +1,7 @@
 use crate::container;
 use crate::event::{self, Event};
 use crate::layout;
+use crate::mouse;
 use crate::overlay;
 use crate::pane_grid::TitleBar;
 use crate::renderer;
@@ -194,6 +195,41 @@ where
         event_status.merge(body_status)
     }
 
+    pub(crate) fn mouse_interaction(
+        &self,
+        layout: Layout<'_>,
+        viewport: &Rectangle,
+        cursor_position: Point,
+    ) -> mouse::Interaction {
+        let mut children = layout.children();
+
+        let (body_layout, title_bar_interaction) =
+            if let Some(title_bar) = &self.title_bar {
+                let title_bar_layout = children.next().unwrap();
+
+                let is_over_pick_area = title_bar
+                    .is_over_pick_area(title_bar_layout, cursor_position);
+
+                if is_over_pick_area {
+                    return mouse::Interaction::Grab;
+                }
+
+                let mouse_interaction = title_bar.mouse_interaction(
+                    title_bar_layout,
+                    viewport,
+                    cursor_position,
+                );
+
+                (children.next().unwrap(), mouse_interaction)
+            } else {
+                (children.next().unwrap(), mouse::Interaction::default())
+            };
+
+        self.body
+            .mouse_interaction(body_layout, viewport, cursor_position)
+            .max(title_bar_interaction)
+    }
+
     pub(crate) fn hash_layout(&self, state: &mut Hasher) {
         if let Some(title_bar) = &self.title_bar {
             title_bar.hash_layout(state);
diff --git a/native/src/widget/pane_grid/title_bar.rs b/native/src/widget/pane_grid/title_bar.rs
index 161eb9bc..493c74db 100644
--- a/native/src/widget/pane_grid/title_bar.rs
+++ b/native/src/widget/pane_grid/title_bar.rs
@@ -1,6 +1,7 @@
 use crate::container;
 use crate::event::{self, Event};
 use crate::layout;
+use crate::mouse;
 use crate::overlay;
 use crate::renderer;
 use crate::{
@@ -249,6 +250,35 @@ where
         control_status.merge(title_status)
     }
 
+    pub(crate) fn mouse_interaction(
+        &self,
+        layout: Layout<'_>,
+        viewport: &Rectangle,
+        cursor_position: Point,
+    ) -> mouse::Interaction {
+        let mut children = layout.children();
+        let padded = children.next().unwrap();
+
+        let mut children = padded.children();
+        let title_layout = children.next().unwrap();
+
+        let title_interaction = self.content.mouse_interaction(
+            title_layout,
+            viewport,
+            cursor_position,
+        );
+
+        if let Some(controls) = &self.controls {
+            let controls_layout = children.next().unwrap();
+
+            controls
+                .mouse_interaction(controls_layout, viewport, cursor_position)
+                .max(title_interaction)
+        } else {
+            title_interaction
+        }
+    }
+
     pub(crate) fn overlay(
         &mut self,
         layout: Layout<'_>,
diff --git a/native/src/widget/scrollable.rs b/native/src/widget/scrollable.rs
index 76badbde..563ea370 100644
--- a/native/src/widget/scrollable.rs
+++ b/native/src/widget/scrollable.rs
@@ -485,15 +485,20 @@ where
         };
 
         if let Some(scrollbar) = scrollbar {
-            renderer.with_layer(bounds, Vector::new(0, offset), |renderer| {
-                self.content.draw(
-                    renderer,
-                    style,
-                    content_layout,
-                    cursor_position,
-                    &Rectangle {
-                        y: bounds.y + offset as f32,
-                        ..bounds
+            renderer.with_layer(bounds, |renderer| {
+                renderer.with_translation(
+                    Vector::new(0.0, -(offset as f32)),
+                    |renderer| {
+                        self.content.draw(
+                            renderer,
+                            style,
+                            content_layout,
+                            cursor_position,
+                            &Rectangle {
+                                y: bounds.y + offset as f32,
+                                ..bounds
+                            },
+                        );
                     },
                 );
             });
@@ -509,7 +514,7 @@ where
             let is_scrollbar_visible =
                 style.background.is_some() || style.border_width > 0.0;
 
-            renderer.with_layer(bounds, Vector::new(0, 0), |renderer| {
+            renderer.with_layer(bounds, |renderer| {
                 if is_scrollbar_visible {
                     renderer.fill_rectangle(renderer::Quad {
                         bounds: scrollbar.bounds,
diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs
index 0a2b19a3..c2950db9 100644
--- a/native/src/widget/text_input.rs
+++ b/native/src/widget/text_input.rs
@@ -751,11 +751,9 @@ where
         };
 
         if text_width > text_bounds.width {
-            renderer.with_layer(
-                text_bounds,
-                Vector::new(offset as u32, 0),
-                render,
-            );
+            renderer.with_layer(text_bounds, |renderer| {
+                renderer.with_translation(Vector::new(-offset, 0.0), render)
+            });
         } else {
             render(renderer);
         }