app menu only shows when user is connected
This commit is contained in:
@@ -1,12 +1,11 @@
|
||||
use crate::{get_app_handle, lock_r, services::app_menu::open_app_menu_window, state::FDOLL};
|
||||
use tauri::{
|
||||
menu::{Menu, MenuItem},
|
||||
tray::TrayIconBuilder,
|
||||
};
|
||||
use tracing::error;
|
||||
|
||||
use crate::{get_app_handle, services::app_menu::open_app_menu_window};
|
||||
|
||||
pub fn init_system_tray() {
|
||||
pub fn init_system_tray() -> tauri::tray::TrayIcon {
|
||||
let app = get_app_handle();
|
||||
|
||||
let quit_i = MenuItem::with_id(app, "quit", "Quit", true, None::<&str>).unwrap();
|
||||
@@ -18,7 +17,7 @@ pub fn init_system_tray() {
|
||||
Err(err) => todo!("Handle error: {}", err),
|
||||
};
|
||||
|
||||
match TrayIconBuilder::new()
|
||||
TrayIconBuilder::new()
|
||||
.menu(&menu)
|
||||
.on_menu_event(|app, event| match event.id.as_ref() {
|
||||
"quit" => {
|
||||
@@ -33,8 +32,31 @@ pub fn init_system_tray() {
|
||||
})
|
||||
.icon(app.default_window_icon().unwrap().clone())
|
||||
.build(app)
|
||||
{
|
||||
Ok(it) => it,
|
||||
Err(err) => todo!("Handle error: {}", err),
|
||||
};
|
||||
.unwrap_or_else(|err| panic!("Failed to build tray: {}", err))
|
||||
}
|
||||
|
||||
pub fn update_system_tray(is_logged_in: bool) {
|
||||
let app = get_app_handle();
|
||||
let guard = lock_r!(FDOLL);
|
||||
if let Some(tray) = &guard.tray {
|
||||
let quit_i = MenuItem::with_id(app, "quit", "Quit", true, None::<&str>).unwrap();
|
||||
let menu = if is_logged_in {
|
||||
let open_app_menu_i =
|
||||
MenuItem::with_id(app, "open-app-menu", "Open App Menu", true, None::<&str>)
|
||||
.unwrap();
|
||||
Menu::with_items(app, &[&open_app_menu_i, &quit_i])
|
||||
} else {
|
||||
Menu::with_items(app, &[&quit_i])
|
||||
};
|
||||
let menu = match menu {
|
||||
Ok(it) => it,
|
||||
Err(err) => {
|
||||
error!("Failed to create menu: {}", err);
|
||||
return;
|
||||
}
|
||||
};
|
||||
if let Err(err) = tray.set_menu(Some(menu)) {
|
||||
error!("Failed to update tray menu: {}", err);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user