TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-07-10 17:25:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix tray icon click (regression due to breaking change in tray-icon 0.17) (#15413)

Browse Source
This commit is contained in:
Daniel Marschall
2026-06-25 03:43:04 +02:00
committed by GitHub
parent b8117c5c34
commit 0cbdb6ffb3
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/tray.rs
View File

@@ -143,12 +143,21 @@ fn make_tray() -> hbb_common::ResultType<()> {
} }
// We create the icon once the event loop is actually running // We create the icon once the event loop is actually running
// to prevent issues like https://github.com/tauri-apps/tray-icon/issues/90 // to prevent issues like https://github.com/tauri-apps/tray-icon/issues/90
let tray = TrayIconBuilder::new() let mut builder = TrayIconBuilder::new()
.with_menu(Box::new(tray_menu.clone())) .with_menu(Box::new(tray_menu.clone()))
.with_tooltip(tooltip(0)) .with_tooltip(tooltip(0))
.with_icon(icon.clone()) .with_icon(icon.clone());
.with_icon_as_template(true) // mac only #[cfg(target_os = "macos")]
.build(); {
builder = builder.with_icon_as_template(true);
}
#[cfg(target_os = "windows")]
{
// Required since tray-icon 0.17
// Fixes #15215, #15222, #15410
builder = builder.with_menu_on_left_click(false);
}
let tray = builder.build();
match tray { match tray {
Ok(tray) => _tray_icon = Arc::new(Mutex::new(Some(tray))), Ok(tray) => _tray_icon = Arc::new(Mutex::new(Some(tray))),
Err(err) => { Err(err) => {