lostecho/Pake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

屏蔽Mac端托盘相关代码

Browse Source
This commit is contained in:
Tlntin
2022-12-28 15:06:30 +08:00
parent b2d536364c
commit c32ce3e25b
4 changed files with 38 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src-tauri/src/lib.rs
View File

@@ -5,9 +5,12 @@ use tauri::MenuItem;
#[macro_use]
extern crate objc;
#[cfg(any(target_os = "linux", target_os = "windows"))]
use tauri::{Manager, SystemTray, SystemTrayEvent, SystemTrayMenu};
use tauri::{
window::PlatformWebview, App, Config, CustomMenuItem, Manager, Menu, Submenu, SystemTray,
SystemTrayEvent, SystemTrayMenu, Window, WindowBuilder, WindowMenuEvent, WindowUrl,
window::PlatformWebview, App, Config, CustomMenuItem, Menu, Submenu, Window, WindowBuilder,
WindowMenuEvent, WindowUrl,
};
mod pake;
use pake::PakeConfig;
@@ -149,6 +152,7 @@ pub fn get_pake_config() -> (PakeConfig, Config) {
(pake_config, tauri_config)
}
#[cfg(any(target_os = "linux", target_os = "windows"))]
pub fn get_system_tray(show_menu: bool) -> SystemTray {
let hide_app = CustomMenuItem::new("hide_app".to_string(), "Hide App");
let show_app = CustomMenuItem::new("show_app".to_string(), "Show App");
@@ -169,6 +173,7 @@ pub fn get_system_tray(show_menu: bool) -> SystemTray {
}
}
#[cfg(any(target_os = "linux", target_os = "windows"))]
pub fn system_tray_handle(app: &tauri::AppHandle, event: tauri::SystemTrayEvent) {
if let SystemTrayEvent::MenuItemClick { tray_id: _, id, .. } = event {
match id.as_str() {
@@ -251,7 +256,7 @@ pub fn get_window(app: &mut App, config: PakeConfig, _data_dir: std::path::PathB
.fullscreen(window_config.fullscreen)
// .transparent(window_config.transparent)
//用于隐藏头部
.title_bar_style(tauri_utils::TitleBarStyle::Overlay)
// .title_bar_style(tauri_utils::TitleBarStyle::Overlay)
.inner_size(window_config.width, window_config.height)
.initialization_script(include_str!("pake.js"));

47
src-tauri/src/main.rs
View File

@@ -3,35 +3,46 @@
windows_subsystem = "windows"
)]
use app::{
get_data_dir, get_menu, get_pake_config, get_system_tray, get_window, menu_event_handle,
system_tray_handle,
};
use app::{get_data_dir, get_menu, get_pake_config, get_window, menu_event_handle};
pub fn run_app() {
let (pake_config, tauri_config) = get_pake_config();
let show_menu = pake_config.show_menu();
let show_system_tray = pake_config.show_system_tray();
let system_tray = get_system_tray(show_menu);
let data_dir = get_data_dir(tauri_config);
let menu = get_menu();
let tauri_app = if show_menu && !show_system_tray {
let data_dir = get_data_dir(tauri_config);
#[cfg(any(target_os = "linux", target_os = "windows"))]
let tauri_app = {
use app::{get_system_tray, system_tray_handle};
let show_system_tray = pake_config.show_system_tray();
let system_tray = get_system_tray(show_menu);
let tauri_app = if show_menu && !show_system_tray {
tauri::Builder::default()
.menu(menu)
.on_menu_event(menu_event_handle)
} else if !show_menu && show_system_tray {
tauri::Builder::default()
.system_tray(system_tray)
.on_system_tray_event(system_tray_handle)
} else if show_menu && show_system_tray {
tauri::Builder::default()
.menu(menu)
.on_menu_event(menu_event_handle)
.system_tray(system_tray)
.on_system_tray_event(system_tray_handle)
} else {
tauri::Builder::default()
};
};
#[cfg(target_os = "macos")]
let tauri_app = if show_menu {
tauri::Builder::default()
.menu(menu)
.on_menu_event(menu_event_handle)
} else if !show_menu && show_system_tray {
tauri::Builder::default()
.system_tray(system_tray)
.on_system_tray_event(system_tray_handle)
} else if show_menu && show_system_tray {
tauri::Builder::default()
.menu(menu)
.on_menu_event(menu_event_handle)
.system_tray(system_tray)
.on_system_tray_event(system_tray_handle)
} else {
tauri::Builder::default()
};
tauri_app
.plugin(tauri_plugin_window_state::Builder::default().build())
.invoke_handler(tauri::generate_handler![])