mirror of https://github.com/tauri-apps/tauri
* feat: expose tao event Event::Reopen * Update .changes/event-reopen.md * deps(core::tauri-runtime-wry): update tao to 0.28
This commit is contained in:
parent
783ef0f2d3
commit
78839b6d2f
|
@ -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.
|
|
@ -14,7 +14,7 @@ rust-version = { workspace = true }
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
wry = { version = "0.39.3", default-features = false, features = [ "drag-drop", "protocol", "os-webview" ] }
|
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-runtime = { version = "2.0.0-beta.15", path = "../tauri-runtime" }
|
||||||
tauri-utils = { version = "2.0.0-beta.14", path = "../tauri-utils" }
|
tauri-utils = { version = "2.0.0-beta.14", path = "../tauri-utils" }
|
||||||
raw-window-handle = "0.6"
|
raw-window-handle = "0.6"
|
||||||
|
|
|
@ -3441,6 +3441,13 @@ fn handle_event_loop<T: UserEvent>(
|
||||||
Event::Opened { urls } => {
|
Event::Opened { urls } => {
|
||||||
callback(RunEvent::Opened { urls });
|
callback(RunEvent::Opened { urls });
|
||||||
}
|
}
|
||||||
|
#[cfg(target_os = "macos")]
|
||||||
|
Event::Reopen {
|
||||||
|
has_visible_windows,
|
||||||
|
..
|
||||||
|
} => callback(RunEvent::Reopen {
|
||||||
|
has_visible_windows,
|
||||||
|
}),
|
||||||
_ => (),
|
_ => (),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -235,6 +235,12 @@ pub enum RunEvent<T: UserEvent> {
|
||||||
/// Emitted when the user wants to open the specified resource with the app.
|
/// Emitted when the user wants to open the specified resource with the app.
|
||||||
#[cfg(any(target_os = "macos", target_os = "ios"))]
|
#[cfg(any(target_os = "macos", target_os = "ios"))]
|
||||||
Opened { urls: Vec<url::Url> },
|
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.
|
/// A custom event defined by the user.
|
||||||
UserEvent(T),
|
UserEvent(T),
|
||||||
}
|
}
|
||||||
|
|
|
@ -239,6 +239,14 @@ pub enum RunEvent {
|
||||||
#[cfg(all(desktop, feature = "tray-icon"))]
|
#[cfg(all(desktop, feature = "tray-icon"))]
|
||||||
#[cfg_attr(docsrs, doc(cfg(all(desktop, feature = "tray-icon"))))]
|
#[cfg_attr(docsrs, doc(cfg(all(desktop, feature = "tray-icon"))))]
|
||||||
TrayIconEvent(crate::tray::TrayIconEvent),
|
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 {
|
impl From<EventLoopMessage> for RunEvent {
|
||||||
|
@ -1918,6 +1926,12 @@ fn on_event_loop_event<R: Runtime>(
|
||||||
}
|
}
|
||||||
#[cfg(any(target_os = "macos", target_os = "ios"))]
|
#[cfg(any(target_os = "macos", target_os = "ios"))]
|
||||||
RuntimeRunEvent::Opened { urls } => RunEvent::Opened { urls },
|
RuntimeRunEvent::Opened { urls } => RunEvent::Opened { urls },
|
||||||
|
#[cfg(target_os = "macos")]
|
||||||
|
RuntimeRunEvent::Reopen {
|
||||||
|
has_visible_windows,
|
||||||
|
} => RunEvent::Reopen {
|
||||||
|
has_visible_windows,
|
||||||
|
},
|
||||||
_ => unimplemented!(),
|
_ => unimplemented!(),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue