Ryan/drop-app
1
0
Fork 0
mirror of https://github.com/Drop-OSS/drop-app.git synced 2026-06-22 04:11:37 +10:00
Code Issues Packages Projects Releases Wiki Activity

feat: Add "NO_TRAY_ICON" env option

Browse Source 
Signed-off-by: quexeky <git@quexeky.dev>
This commit is contained in:
quexeky
2025-05-27 12:13:49 +10:00
parent 5251a56c3c
commit 1d0b81078a
1 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src-tauri/src/lib.rs
+36 -21
View File
@@ -330,23 +330,25 @@ pub fn run() {
], ],
)?; )?;
TrayIconBuilder::new() run_on_tray(|| {
.icon(app.default_window_icon().unwrap().clone()) TrayIconBuilder::new()
.menu(&menu) .icon(app.default_window_icon().unwrap().clone())
.on_menu_event(|app, event| match event.id.as_ref() { .menu(&menu)
"open" => { .on_menu_event(|app, event| match event.id.as_ref() {
app.webview_windows().get("main").unwrap().show().unwrap(); "open" => {
} app.webview_windows().get("main").unwrap().show().unwrap();
"quit" => { }
cleanup_and_exit(app, &app.state()); "quit" => {
} cleanup_and_exit(app, &app.state());
}
_ => { _ => {
warn!("menu event not handled: {:?}", event.id); warn!("menu event not handled: {:?}", event.id);
} }
}) })
.build(app) .build(app)
.expect("error while setting up tray menu"); .expect("error while setting up tray menu");
});
{ {
let mut db_handle = borrow_db_mut_checked(); let mut db_handle = borrow_db_mut_checked();
@@ -393,8 +395,10 @@ pub fn run() {
}) })
.on_window_event(|window, event| { .on_window_event(|window, event| {
if let WindowEvent::CloseRequested { api, .. } = event { if let WindowEvent::CloseRequested { api, .. } = event {
window.hide().unwrap(); run_on_tray(|| {
api.prevent_close(); window.hide().unwrap();
api.prevent_close();
});
} }
}) })
.build(tauri::generate_context!()) .build(tauri::generate_context!())
@@ -402,9 +406,20 @@ pub fn run() {
app.run(|_app_handle, event| { app.run(|_app_handle, event| {
if let RunEvent::ExitRequested { code, api, .. } = event { if let RunEvent::ExitRequested { code, api, .. } = event {
if code.is_none() { run_on_tray(|| {
api.prevent_exit(); if code.is_none() {
} api.prevent_exit();
}
});
} }
}); });
} }
fn run_on_tray<T: FnOnce() -> ()>(f: T) {
if match std::env::var("NO_TRAY_ICON") {
Ok(s) => s.to_lowercase() != "true",
Err(_) => true,
} {
(f)();
}
}