suhoan/EasyTier
1
0
Fork 0
mirror of https://mirror.suhoan.cn/https://github.com/EasyTier/EasyTier.git synced 2025-12-12 20:57:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(gui): macOS UX Improvements (#1631)

Browse Source
This commit is contained in:
Mg Pig
2025-12-01 01:11:36 +08:00
committed by GitHub
parent 67cba2c326
commit 70b122fb91
3 changed files with 12 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
easytier-gui/src-tauri/src/lib.rs
View File

@@ -392,19 +392,25 @@ async fn is_client_running() -> Result<bool, String> {
}
#[cfg(not(target_os = "android"))]
fn toggle_window_visibility<R: tauri::Runtime>(app: &tauri::AppHandle<R>) {
fn toggle_window_visibility(app: &tauri::AppHandle) {
if let Some(window) = app.get_webview_window("main") {
if window.is_visible().unwrap_or_default() {
let visible = if window.is_visible().unwrap_or_default() {
if window.is_minimized().unwrap_or_default() {
let _ = window.unminimize();
let _ = window.set_focus();
false
} else {
let _ = window.hide();
true
}
} else {
let _ = window.show();
false
};
if visible {
let _ = window.hide();
} else {
let _ = window.set_focus();
}
let _ = set_dock_visibility(app.clone(), !visible);
}
}
@@ -892,7 +898,7 @@ pub fn run_gui() -> std::process::ExitCode {
.icon(tauri::image::Image::from_bytes(include_bytes!(
"../icons/icon.png"
))?)
.icon_as_template(false)
.icon_as_template(true)
.build(app)?;
Ok(())
@@ -924,6 +930,7 @@ pub fn run_gui() -> std::process::ExitCode {
#[cfg(not(target_os = "android"))]
tauri::WindowEvent::CloseRequested { api, .. } => {
let _ = _win.hide();
let _ = set_dock_visibility(_win.app_handle().clone(), false);
api.prevent_close();
}
_ => {}
@@ -931,20 +938,8 @@ pub fn run_gui() -> std::process::ExitCode {
.build(tauri::generate_context!())
.unwrap();
#[cfg(not(target_os = "macos"))]
app.run(|_app, _event| {});
#[cfg(target_os = "macos")]
{
use tauri::RunEvent;
app.run(|app, event| match event {
RunEvent::Reopen { .. } => {
toggle_window_visibility(app);
}
_ => {}
});
}
std::process::ExitCode::SUCCESS
}