Merge pull request #971 from tarkah/fix/pane-dragging-overlay

fix: allow titlebar overlays to close when dragging pane
iced-rs · Jul 28, 2021 · a08e4eb · a08e4eb
2 parents 2586210 + 6618c6b
commit a08e4eb
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 26 deletions.
diff --git a/native/src/widget/pane_grid.rs b/native/src/widget/pane_grid.rs
@@ -452,24 +452,25 @@ where
             _ => {}
         }
 
-        if self.state.picked_pane().is_none() {
-            self.elements
-                .iter_mut()
-                .zip(layout.children())
-                .map(|((_, pane), layout)| {
-                    pane.on_event(
-                        event.clone(),
-                        layout,
-                        cursor_position,
-                        renderer,
-                        clipboard,
-                        messages,
-                    )
-                })
-                .fold(event_status, event::Status::merge)
-        } else {
-            event::Status::Captured
-        }
+        let picked_pane = self.state.picked_pane().map(|(pane, _)| pane);
+
+        self.elements
+            .iter_mut()
+            .zip(layout.children())
+            .map(|((pane, content), layout)| {
+                let is_picked = picked_pane == Some(*pane);
+
+                content.on_event(
+                    event.clone(),
+                    layout,
+                    cursor_position,
+                    renderer,
+                    clipboard,
+                    messages,
+                    is_picked,
+                )
+            })
+            .fold(event_status, event::Status::merge)
     }
 
     fn draw(

diff --git a/native/src/widget/pane_grid/content.rs b/native/src/widget/pane_grid/content.rs
@@ -149,6 +149,7 @@ where
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         messages: &mut Vec<Message>,
+        is_picked: bool,
     ) -> event::Status {
         let mut event_status = event::Status::Ignored;
 
@@ -169,14 +170,18 @@ where
             layout
         };
 
-        let body_status = self.body.on_event(
-            event,
-            body_layout,
-            cursor_position,
-            renderer,
-            clipboard,
-            messages,
-        );
+        let body_status = if is_picked {
+            event::Status::Ignored
+        } else {
+            self.body.on_event(
+                event,
+                body_layout,
+                cursor_position,
+                renderer,
+                clipboard,
+                messages,
+            )
+        };
 
         event_status.merge(body_status)
     }