Merge pull request #65 from greenhat616/fix-issues

fix: issues
libnyanpasu · Dec 8, 2023 · af2874a · af2874a
2 parents 0946b3c + 3a449d3
commit af2874a
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 3 deletions.
diff --git a/backend/tauri/icons/win-tray-icon-activated.png b/backend/tauri/icons/win-tray-icon-activated.png
diff --git a/backend/tauri/icons/win-tray-icon.png b/backend/tauri/icons/win-tray-icon.png
diff --git a/backend/tauri/src/core/tray.rs b/backend/tauri/src/core/tray.rs
@@ -194,7 +194,7 @@ impl Tray {
                 "restart_clash" => feat::restart_clash_core(),
                 "restart_app" => api::process::restart(&app_handle.env()),
                 "quit" => {
-                    let _ = resolve::save_window_size_position(app_handle, true);
+                    let _ = resolve::save_window_state(app_handle, true);
 
                     resolve::resolve_reset();
                     api::process::kill_children();

diff --git a/backend/tauri/src/main.rs b/backend/tauri/src/main.rs
@@ -132,6 +132,7 @@ fn main() -> std::io::Result<()> {
                     }
                     tauri::WindowEvent::Moved(_) | tauri::WindowEvent::Resized(_) => {
                         // log::info!(target: "app", "window moved or resized");
+                        std::thread::sleep(std::time::Duration::from_nanos(1));
                         let _ = resolve::save_window_state(app_handle, false);
                     }
                     _ => {}

diff --git a/backend/tauri/tauri.conf.json b/backend/tauri/tauri.conf.json
@@ -11,7 +11,7 @@
   },
   "tauri": {
     "systemTray": {
-      "iconPath": "icons/tray-icon.ico",
+      "iconPath": "icons/win-tray-icon.png",
       "iconAsTemplate": true
     },
     "bundle": {

diff --git a/scripts/check.ts b/scripts/check.ts
@@ -50,7 +50,7 @@ const CLASH_MAP = {
 
 /* ======= clash-rs ======= */
 const RS_URL_PREFIX = `https://github.com/Watfaq/clash-rs/releases/download/`;
-const RS_VERSION = "v0.1.9";
+const RS_VERSION = "v0.1.10";
 const RS_MAP = {
   "win32-x64": "clash-x86_64-pc-windows-msvc",
   "darwin-x64": "clash-x86_64-apple-darwin",