Sub windows (#1254)

* Sub windows (squashed from previous branch) * Update druid version. Address review comments * Fix to mac window close handling. Add WindowDisconnected event. Close sub windows when their owning WidgetPod gets a WindowDisconnected event. * Add WindowCloseRequested event and make window close cancellation work on mac. * Update druid/src/event.rs Co-authored-by: Colin Rofls <[email protected]> * Update druid/src/event.rs Co-authored-by: Colin Rofls <[email protected]> * Changes to allow env updates to flow down to sub windows * Doc fix * Review fixes Co-authored-by: Colin Rofls <[email protected]>
linebender · Jan 7, 2021 · 2ff6318 · 2ff6318
1 parent 97716a1
commit 2ff6318
Show file tree

Hide file tree

Showing 12 changed files with 724 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,8 @@ You can find its changes [documented below](#070---2021-01-01).
 ### Highlights
 
 ### Added
+- Sub windows: Allow opening windows that share state with arbitrary parts of the widget hierarchy ([#1254] by [@rjwittams])
+- WindowCloseRequested/WindowDisconnected event when a window is closing ([#1254] by [@rjwittams])
 
 ### Changed
 

diff --git a/druid-shell/Cargo.toml b/druid-shell/Cargo.toml
diff --git a/druid-shell/src/platform/mac/window.rs b/druid-shell/src/platform/mac/window.rs
@@ -419,6 +419,10 @@ lazy_static! {
             sel!(showContextMenu:),
             show_context_menu as extern "C" fn(&mut Object, Sel, id),
         );
+        decl.add_method(
+            sel!(windowShouldClose:),
+            window_should_close as extern "C" fn(&mut Object, Sel, id)->BOOL,
+        );
         decl.add_method(
             sel!(windowWillClose:),
             window_will_close as extern "C" fn(&mut Object, Sel, id),
@@ -827,7 +831,16 @@ extern "C" fn window_did_resign_key(this: &mut Object, _: Sel, _notification: id
     }
 }
 
-extern "C" fn window_will_close(this: &mut Object, _: Sel, _window: id) {
+extern "C" fn window_should_close(this: &mut Object, _: Sel, _window: id) -> BOOL {
+    unsafe {
+        let view_state: *mut c_void = *this.get_ivar("viewState");
+        let view_state = &mut *(view_state as *mut ViewState);
+        (*view_state).handler.request_close();
+        NO
+    }
+}
+
+extern "C" fn window_will_close(this: &mut Object, _: Sel, _notification: id) {
     unsafe {
         let view_state: *mut c_void = *this.get_ivar("viewState");
         let view_state = &mut *(view_state as *mut ViewState);