Fix the tray: closing the window destroyed it, left-click did nothing
Two bugs compounded into "the tray icon does not bring the app back."
close() — what the custom title bar's X calls — fires CloseRequested and then
destroys the window unless something intervenes. Nothing did. Once destroyed,
get_webview_window("main") returns None for the rest of the process, so the
tray's own "Show Textream" item had nothing to show; it was reaching for a
window that no longer existed. The X now hides the main window instead of
letting it close, which is what having a "Show Textream" tray item in the
first place implied was supposed to happen — closing the editor tucks it
away, it does not end whatever the overlay is still doing.
Separately, show_menu_on_left_click(false) was set to free up left-click for
something, but nothing was ever wired to it — left-click did nothing at all,
which is not how any other tray icon on Windows behaves. Added a handler
matching Windows' own WM_LBUTTONUP as the activation signal, sharing the same
show-and-focus logic the menu item uses so both gestures agree.
Verified the click semantics against tray-icon's own Windows backend rather
than trusting Tauri's wrapper doc comments, which have Up and Down's
descriptions swapped — WM_LBUTTONUP really does map to MouseButtonState::Up,
matching every other tray icon's release-to-activate behaviour.
This commit is contained in:
parent
ab607344d6
commit
f659e4a698
1 changed files with 48 additions and 8 deletions
|
|
@ -21,7 +21,7 @@ use std::path::PathBuf;
|
||||||
use std::sync::Mutex;
|
use std::sync::Mutex;
|
||||||
|
|
||||||
use tauri::menu::{Menu, MenuItem};
|
use tauri::menu::{Menu, MenuItem};
|
||||||
use tauri::tray::TrayIconBuilder;
|
use tauri::tray::{MouseButton, MouseButtonState, TrayIconBuilder, TrayIconEvent};
|
||||||
use tauri::{AppHandle, Emitter, Manager, WebviewWindow};
|
use tauri::{AppHandle, Emitter, Manager, WebviewWindow};
|
||||||
|
|
||||||
use audio::{AudioEngine, DiagnosticsView};
|
use audio::{AudioEngine, DiagnosticsView};
|
||||||
|
|
@ -380,6 +380,19 @@ fn set_hide_from_capture(app: AppHandle, enabled: bool) -> Result<bool, String>
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Brings the main window to the front, restoring it if minimised.
|
||||||
|
///
|
||||||
|
/// Shared by the tray's left-click and its "Show Textream" menu item so the
|
||||||
|
/// two gestures a user reaches for — click the icon, or right-click and pick
|
||||||
|
/// the item — do exactly the same thing.
|
||||||
|
fn show_main_window(app: &AppHandle) {
|
||||||
|
if let Some(window) = app.get_webview_window("main") {
|
||||||
|
let _ = window.show();
|
||||||
|
let _ = window.unminimize();
|
||||||
|
let _ = window.set_focus();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn build_tray(app: &AppHandle) -> tauri::Result<()> {
|
fn build_tray(app: &AppHandle) -> tauri::Result<()> {
|
||||||
let show = MenuItem::with_id(app, "show", "Show Textream", true, None::<&str>)?;
|
let show = MenuItem::with_id(app, "show", "Show Textream", true, None::<&str>)?;
|
||||||
let hide = MenuItem::with_id(app, "hide-overlay", "Hide overlay", true, None::<&str>)?;
|
let hide = MenuItem::with_id(app, "hide-overlay", "Hide overlay", true, None::<&str>)?;
|
||||||
|
|
@ -390,15 +403,25 @@ fn build_tray(app: &AppHandle) -> tauri::Result<()> {
|
||||||
.icon(app.default_window_icon().unwrap().clone())
|
.icon(app.default_window_icon().unwrap().clone())
|
||||||
.tooltip("Textream")
|
.tooltip("Textream")
|
||||||
.menu(&menu)
|
.menu(&menu)
|
||||||
|
// The menu still opens on right-click regardless of this setting; it
|
||||||
|
// only frees up left-click, which every other tray app on Windows
|
||||||
|
// treats as "show me the window" rather than "show me the menu".
|
||||||
.show_menu_on_left_click(false)
|
.show_menu_on_left_click(false)
|
||||||
|
.on_tray_icon_event(|tray, event| {
|
||||||
|
// Windows itself treats WM_LBUTTONUP as the tray icon's activation
|
||||||
|
// signal, not the button-down that precedes it — matching that is
|
||||||
|
// what makes this feel like every other tray icon.
|
||||||
|
if let TrayIconEvent::Click {
|
||||||
|
button: MouseButton::Left,
|
||||||
|
button_state: MouseButtonState::Up,
|
||||||
|
..
|
||||||
|
} = event
|
||||||
|
{
|
||||||
|
show_main_window(tray.app_handle());
|
||||||
|
}
|
||||||
|
})
|
||||||
.on_menu_event(|app, event| match event.id.as_ref() {
|
.on_menu_event(|app, event| match event.id.as_ref() {
|
||||||
"show" => {
|
"show" => show_main_window(app),
|
||||||
if let Some(window) = app.get_webview_window("main") {
|
|
||||||
let _ = window.show();
|
|
||||||
let _ = window.unminimize();
|
|
||||||
let _ = window.set_focus();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
"hide-overlay" => {
|
"hide-overlay" => {
|
||||||
if let Some(window) = app.get_webview_window(OVERLAY) {
|
if let Some(window) = app.get_webview_window(OVERLAY) {
|
||||||
let _ = window.hide();
|
let _ = window.hide();
|
||||||
|
|
@ -428,6 +451,23 @@ pub fn run() {
|
||||||
if let Some(window) = app.get_webview_window("main") {
|
if let Some(window) = app.get_webview_window("main") {
|
||||||
let applied = backdrop::apply(&window);
|
let applied = backdrop::apply(&window);
|
||||||
*app.state::<BackdropState>().0.lock().unwrap() = applied;
|
*app.state::<BackdropState>().0.lock().unwrap() = applied;
|
||||||
|
|
||||||
|
// `close()` — what the custom title bar's ✕ button calls —
|
||||||
|
// fires this event and then destroys the window unless something
|
||||||
|
// intervenes. A destroyed window is gone for the rest of the
|
||||||
|
// process: `get_webview_window("main")` returns `None` from then
|
||||||
|
// on, so neither the tray's "Show Textream" item nor a left-click
|
||||||
|
// could ever bring it back. Hiding it here instead is what makes
|
||||||
|
// the tray icon's "show" gesture mean anything at all — the ✕
|
||||||
|
// button tucks the editor away rather than ending the session
|
||||||
|
// the overlay may still be running.
|
||||||
|
let hideable = window.clone();
|
||||||
|
window.on_window_event(move |event| {
|
||||||
|
if let tauri::WindowEvent::CloseRequested { api, .. } = event {
|
||||||
|
api.prevent_close();
|
||||||
|
let _ = hideable.hide();
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
let refused = shortcuts::register(&handle);
|
let refused = shortcuts::register(&handle);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue