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

Auto-fix formatting issues

Browse Source
This commit is contained in:
GitHub Action
2025-10-17 10:02:16 +00:00
parent a8d614ed18
commit d4bbea917e
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src-tauri/src/app/setup.rs
View File

@@ -9,7 +9,11 @@ use tauri::{
use tauri_plugin_global_shortcut::{GlobalShortcutExt, Shortcut};
use tauri_plugin_window_state::{AppHandleExt, StateFlags};
pub fn set_system_tray(app: &AppHandle, show_system_tray: bool, tray_icon_path: &str) -> tauri::Result<()> {
pub fn set_system_tray(
app: &AppHandle,
show_system_tray: bool,
tray_icon_path: &str,
) -> tauri::Result<()> {
if !show_system_tray {
app.remove_tray_by_id("pake-tray");
return Ok(());
@@ -61,11 +65,15 @@ pub fn set_system_tray(app: &AppHandle, show_system_tray: bool, tray_icon_path:
_ => {}
})
.icon(if tray_icon_path.is_empty() {
app.default_window_icon().unwrap_or_else(|| panic!("Failed to get default window icon")).clone()
app.default_window_icon()
.unwrap_or_else(|| panic!("Failed to get default window icon"))
.clone()
} else {
tauri::image::Image::from_path(tray_icon_path).unwrap_or_else(|_| {
// If custom tray icon fails to load, fallback to default
app.default_window_icon().unwrap_or_else(|| panic!("Failed to get default window icon")).clone()
app.default_window_icon()
.unwrap_or_else(|| panic!("Failed to get default window icon"))
.clone()
})
})
.build(app)?;

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

@@ -63,7 +63,12 @@ pub fn run_app() {
])
.setup(move |app| {
let window = set_window(app, &pake_config, &tauri_config);
set_system_tray(app.app_handle(), show_system_tray, &pake_config.system_tray_path).unwrap();
set_system_tray(
app.app_handle(),
show_system_tray,
&pake_config.system_tray_path,
)
.unwrap();
set_global_shortcut(app.app_handle(), activation_shortcut).unwrap();
// Show window after state restoration to prevent position flashing