feat: Event::Reopen support for macOS (#5)

* feat: `Reopen` event support for macOS

* chore: update docs

Co-authored-by: Mads Marquart <mads@marquart.dk>

* fix: remove redundant enum variants

* fix: adapt code

---------

Co-authored-by: Mads Marquart <mads@marquart.dk>

Author: I-Info

Cargo.toml

@@ -72,7 +72,7 @@ smol_str = "0.2.0"
 [dev-dependencies]
 image = { version = "0.24.0", default-features = false, features = ["png"] }
 simple_logger = { version = "4.2.0", default_features = false }
-winit = { path = ".", features = ["rwh_05"] }
+# winit = { path = ".", features = ["rwh_05"] }
 
 [target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dev-dependencies]
 softbuffer = "0.3.0"

src/event.rs

@@ -251,6 +251,24 @@ pub enum Event<T: 'static> {
     ///
     /// - **macOS / Wayland / Windows / Orbital:** Unsupported.
     MemoryWarning,
+
+    /// Emitted when the application has received a reopen request from OS.
+    ///
+    /// ## Platform-specific
+    ///
+    /// ### macOS
+    ///
+    /// On macOS, the `Reopen` event is emitted in response to an [`applicationShouldHandleReopen`]
+    /// callback, which is usually called whenever the Finder reactivates an already running
+    /// application because the user double-clicked it again or used the dock to activate it.
+    /// Usually, the user would expect you to create a new window if there isn't any.
+    ///
+    /// [`applicationShouldHandleReopen`]: https://developer.apple.com/documentation/appkit/nsapplicationdelegate/1428638-applicationshouldhandlereopen
+    ///
+    /// ### Others
+    ///
+    /// - **Android / iOS / Web / Wayland / Windows / Orbital:** Unsupported.
+    Reopen,
 }
 
 impl<T> Event<T> {
@@ -267,6 +285,7 @@ impl<T> Event<T> {
             Suspended => Ok(Suspended),
             Resumed => Ok(Resumed),
             MemoryWarning => Ok(MemoryWarning),
+            Reopen => Ok(Reopen),
         }
     }
 }

src/platform_impl/macos/app_delegate.rs

@@ -8,6 +8,7 @@ use objc2::{declare_class, msg_send, msg_send_id, mutability, ClassType};
 
 use super::app_state::AppState;
 use super::appkit::NSApplicationActivationPolicy;
+use crate::event::Event;
 
 declare_class!(
     #[derive(Debug)]
@@ -58,6 +59,18 @@ declare_class!(
             // TODO: Notify every window that it will be destroyed, like done in iOS?
             AppState::internal_exit();
         }
+
+        #[method(applicationShouldHandleReopen:hasVisibleWindows:)]
+        fn should_handle_reopen(
+            &self,
+            _sender: &Option<&AnyObject>,
+            _has_visible_windows: bool,
+        ) -> bool {
+            trace_scope!("applicationShouldHandleReopen:hasVisibleWindows:");
+            AppState::queue_event(Event::Reopen);
+            // return true to preserve the default behavior, such as showing the minimized window.
+            true
+        }
     }
 );
 

src/platform_impl/windows/window.rs

@@ -49,8 +49,8 @@ use windows_sys::Win32::{
             MENU_ITEM_STATE, MFS_DISABLED, MFS_ENABLED, MF_BYCOMMAND, NID_READY, PM_NOREMOVE,
             SC_CLOSE, SC_MAXIMIZE, SC_MINIMIZE, SC_MOVE, SC_RESTORE, SC_SIZE, SM_DIGITIZER,
             SWP_ASYNCWINDOWPOS, SWP_NOACTIVATE, SWP_NOSIZE, SWP_NOZORDER, TPM_LEFTALIGN,
-            TPM_RETURNCMD, WDA_EXCLUDEFROMCAPTURE, WDA_NONE, WM_NCLBUTTONDOWN,
-            WM_SYSCOMMAND, WNDCLASSEXW,
+            TPM_RETURNCMD, WDA_EXCLUDEFROMCAPTURE, WDA_NONE, WM_NCLBUTTONDOWN, WM_SYSCOMMAND,
+            WNDCLASSEXW,
         },
     },
 };