From e68ab204208217615b016c9d8c780c42c6e154a9 Mon Sep 17 00:00:00 2001 From: lencx Date: Sun, 8 Jan 2023 21:32:42 +0800 Subject: [PATCH] chore: fmt --- src-tauri/src/app/menu.rs | 7 +++---- src-tauri/src/main.rs | 10 +++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src-tauri/src/app/menu.rs b/src-tauri/src/app/menu.rs index 0f8bf18..3c0a831 100644 --- a/src-tauri/src/app/menu.rs +++ b/src-tauri/src/app/menu.rs @@ -41,10 +41,6 @@ pub fn init() -> Menu { stay_on_top }; - #[cfg(target_os = "macos")] - let titlebar = - CustomMenuItem::new("titlebar".to_string(), "Titlebar").accelerator("CmdOrCtrl+B"); - let theme_light = CustomMenuItem::new("theme_light".to_string(), "Light"); let theme_dark = CustomMenuItem::new("theme_dark".to_string(), "Dark"); let theme_system = CustomMenuItem::new("theme_system".to_string(), "System"); @@ -62,6 +58,9 @@ pub fn init() -> Menu { popup_search }; + #[cfg(target_os = "macos")] + let titlebar = + CustomMenuItem::new("titlebar".to_string(), "Titlebar").accelerator("CmdOrCtrl+B"); #[cfg(target_os = "macos")] let titlebar_menu = if chat_conf.titlebar { titlebar.selected() diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 5d9db81..3ba7221 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -45,6 +45,11 @@ async fn main() { ]) .build(), ) + .plugin(tauri_plugin_positioner::init()) + .plugin(tauri_plugin_autostart::init( + MacosLauncher::LaunchAgent, + None, + )) .invoke_handler(tauri::generate_handler![ cmd::drag_window, cmd::fullscreen, @@ -68,11 +73,6 @@ async fn main() { fs_extra::metadata, ]) .setup(setup::init) - .plugin(tauri_plugin_positioner::init()) - .plugin(tauri_plugin_autostart::init( - MacosLauncher::LaunchAgent, - None, - )) .menu(menu::init()) .system_tray(menu::tray_menu()) .on_menu_event(menu::menu_handler)