Skip to content

Commit

Permalink
feat(macos): Expose tao event Event::Reopen, closes #3084 (#4865)
Browse files Browse the repository at this point in the history
* feat: expose tao event Event::Reopen

* Update .changes/event-reopen.md

* deps(core::tauri-runtime-wry): update tao to 0.28
  • Loading branch information
BillGoldenWater authored May 7, 2024
1 parent 783ef0f commit 78839b6
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 1 deletion.
7 changes: 7 additions & 0 deletions .changes/event-reopen.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'tauri': 'minor:feat'
'tauri-runtime': 'minor:feat'
'tauri-runtime-wry': 'minor:feat'
---

Add `RunEvent::Reopen` for handle click on dock icon on macOS.
2 changes: 1 addition & 1 deletion core/tauri-runtime-wry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ rust-version = { workspace = true }

[dependencies]
wry = { version = "0.39.3", default-features = false, features = [ "drag-drop", "protocol", "os-webview" ] }
tao = { version = "0.27", default-features = false, features = [ "rwh_06" ] }
tao = { version = "0.28", default-features = false, features = [ "rwh_06" ] }
tauri-runtime = { version = "2.0.0-beta.15", path = "../tauri-runtime" }
tauri-utils = { version = "2.0.0-beta.14", path = "../tauri-utils" }
raw-window-handle = "0.6"
Expand Down
7 changes: 7 additions & 0 deletions core/tauri-runtime-wry/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3441,6 +3441,13 @@ fn handle_event_loop<T: UserEvent>(
Event::Opened { urls } => {
callback(RunEvent::Opened { urls });
}
#[cfg(target_os = "macos")]
Event::Reopen {
has_visible_windows,
..
} => callback(RunEvent::Reopen {
has_visible_windows,
}),
_ => (),
}
}
Expand Down
6 changes: 6 additions & 0 deletions core/tauri-runtime/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,12 @@ pub enum RunEvent<T: UserEvent> {
/// Emitted when the user wants to open the specified resource with the app.
#[cfg(any(target_os = "macos", target_os = "ios"))]
Opened { urls: Vec<url::Url> },
/// Emitted when the NSApplicationDelegate's applicationShouldHandleReopen gets called
#[cfg(target_os = "macos")]
Reopen {
/// Indicates whether the NSApplication object found any visible windows in your application.
has_visible_windows: bool,
},
/// A custom event defined by the user.
UserEvent(T),
}
Expand Down
14 changes: 14 additions & 0 deletions core/tauri/src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,14 @@ pub enum RunEvent {
#[cfg(all(desktop, feature = "tray-icon"))]
#[cfg_attr(docsrs, doc(cfg(all(desktop, feature = "tray-icon"))))]
TrayIconEvent(crate::tray::TrayIconEvent),
/// Emitted when the NSApplicationDelegate's applicationShouldHandleReopen gets called
#[non_exhaustive]
#[cfg(target_os = "macos")]
#[cfg_attr(docsrs, doc(cfg(target_os = "macos")))]
Reopen {
/// Indicates whether the NSApplication object found any visible windows in your application.
has_visible_windows: bool,
},
}

impl From<EventLoopMessage> for RunEvent {
Expand Down Expand Up @@ -1918,6 +1926,12 @@ fn on_event_loop_event<R: Runtime>(
}
#[cfg(any(target_os = "macos", target_os = "ios"))]
RuntimeRunEvent::Opened { urls } => RunEvent::Opened { urls },
#[cfg(target_os = "macos")]
RuntimeRunEvent::Reopen {
has_visible_windows,
} => RunEvent::Reopen {
has_visible_windows,
},
_ => unimplemented!(),
};

Expand Down

0 comments on commit 78839b6

Please sign in to comment.