Skip to content

fix: tray show opens main window on first click #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mxyhi wants to merge 1 commit into from
Closed

fix: tray show opens main window on first click #146

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src-tauri/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,9 @@ pub(crate) fn show_or_create_main_window(app: &tauri::AppHandle) {
pub(crate) fn hide_main_window(app: &tauri::AppHandle) {
set_main_window_visibility(app, false);
if let Some(window) = app.get_webview_window(MAIN_WINDOW_LABEL) {
// Keep the window instance and only hide it; destroying here can race
// with tray reopen and cause the first "show" click to no-op.
let _ = window.hide();
if let Err(err) = window.destroy() {
tracing::warn!(error = %err, "destroy window failed");
}
}

if let Some(tray_state) = app.try_state::<tray::TrayState>() {
Expand Down Expand Up @@ -749,7 +748,7 @@ pub fn run() {
{
return;
}
// 关闭即销毁 WebView，后台核心继续运行。
// 主窗口关闭时最小化到托盘，后台核心继续运行。
api.prevent_close();
if window.label() == MAIN_WINDOW_LABEL {
hide_main_window(window.app_handle());
Expand Down