From 20fd1f2047b2c425398d0b237c6d3031deaaa0c9 Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Fri, 7 Oct 2022 09:03:44 -0700
Subject: Render pane grid titlebar after body

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

(limited to 'native/src/widget/pane_grid')

diff --git a/native/src/widget/pane_grid/content.rs b/native/src/widget/pane_grid/content.rs
index 98ce2c4b..8d26c3d8 100644
--- a/native/src/widget/pane_grid/content.rs
+++ b/native/src/widget/pane_grid/content.rs
@@ -115,25 +115,25 @@ where
 
             let show_controls = bounds.contains(cursor_position);
 
-            title_bar.draw(
-                &tree.children[1],
+            self.body.as_widget().draw(
+                &tree.children[0],
                 renderer,
                 theme,
                 style,
-                title_bar_layout,
+                body_layout,
                 cursor_position,
                 viewport,
-                show_controls,
             );
 
-            self.body.as_widget().draw(
-                &tree.children[0],
+            title_bar.draw(
+                &tree.children[1],
                 renderer,
                 theme,
                 style,
-                body_layout,
+                title_bar_layout,
                 cursor_position,
                 viewport,
+                show_controls,
             );
         } else {
             self.body.as_widget().draw(
-- 
cgit 


From dca99f35e938bebdfdad16eaabd220b5d52c2375 Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Mon, 17 Oct 2022 14:38:24 -0700
Subject: Fix pane grid mouse interactions

- Use `grabbing` interaction while dragging
- Ignore grab interaction when dragging is disabled
---
 native/src/widget/pane_grid/content.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'native/src/widget/pane_grid')

diff --git a/native/src/widget/pane_grid/content.rs b/native/src/widget/pane_grid/content.rs
index 8d26c3d8..c236d820 100644
--- a/native/src/widget/pane_grid/content.rs
+++ b/native/src/widget/pane_grid/content.rs
@@ -238,6 +238,7 @@ where
         cursor_position: Point,
         viewport: &Rectangle,
         renderer: &Renderer,
+        drag_enabled: bool,
     ) -> mouse::Interaction {
         let (body_layout, title_bar_interaction) =
             if let Some(title_bar) = &self.title_bar {
@@ -247,7 +248,7 @@ where
                 let is_over_pick_area = title_bar
                     .is_over_pick_area(title_bar_layout, cursor_position);
 
-                if is_over_pick_area {
+                if is_over_pick_area && drag_enabled {
                     return mouse::Interaction::Grab;
                 }
 
-- 
cgit