From 5164aec37b2c6fe92d7fc43762058f7019337558 Mon Sep 17 00:00:00 2001 From: ctaoist <14012127+ctaoist@users.noreply.github.com> Date: Wed, 25 May 2022 16:06:39 +0800 Subject: [PATCH] feat: light mode wip (#96) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 关闭窗口释放UI资源 * windows 还有左键点击事件 * 兼容enhance profile * bug 修复 --- src-tauri/src/core/mod.rs | 12 +++++- src-tauri/src/core/verge.rs | 4 ++ src-tauri/src/main.rs | 55 ++++++++++++++++-------- src/components/layout/layout-control.tsx | 2 +- src/pages/_layout.tsx | 2 +- src/services/enhance.ts | 27 ++++++++---- 6 files changed, 70 insertions(+), 32 deletions(-) diff --git a/src-tauri/src/core/mod.rs b/src-tauri/src/core/mod.rs index 5907cf4..ec4e396 100644 --- a/src-tauri/src/core/mod.rs +++ b/src-tauri/src/core/mod.rs @@ -48,9 +48,10 @@ pub struct Core { impl Core { pub fn new() -> Core { let clash = Clash::new(); - let verge = Verge::new(); + let mut verge = Verge::new(); let profiles = Profiles::new(); let service = Service::new(); + verge.launch_flag = Some(true); Core { clash: Arc::new(Mutex::new(clash)), @@ -382,7 +383,14 @@ impl Core { result.error.map(|err| log::error!("{err}")); }); - window.emit("script-handler", payload).unwrap(); + let mut verge = self.verge.lock(); + let silent_start = verge.enable_silent_start.clone(); + if silent_start.unwrap_or(false) && verge.launch_flag.unwrap_or(false) { + window.emit("script-handler-close", payload).unwrap(); + verge.launch_flag = Some(false); + } else { + window.emit("script-handler", payload).unwrap(); + } Ok(()) } diff --git a/src-tauri/src/core/verge.rs b/src-tauri/src/core/verge.rs index a03bde4..0db1621 100644 --- a/src-tauri/src/core/verge.rs +++ b/src-tauri/src/core/verge.rs @@ -37,6 +37,10 @@ pub struct Verge { /// enable proxy guard pub enable_proxy_guard: Option, + /// launch flag + #[serde(skip_serializing)] + pub launch_flag: Option, + /// set system proxy bypass pub system_proxy_bypass: Option, diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 0cec26d..19bbc41 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -44,10 +44,23 @@ fn main() -> std::io::Result<()> { .on_system_tray_event(move |app_handle, event| match event { SystemTrayEvent::MenuItemClick { id, .. } => match id.as_str() { "open_window" => { - let window = app_handle.get_window("main").unwrap(); - window.unminimize().unwrap(); - window.show().unwrap(); - window.set_focus().unwrap(); + tauri::window::WindowBuilder::new( + app_handle, + "main".to_string(), + tauri::WindowUrl::App("index.html".into()), + ) + .title("Clash Verge") + .center() + .decorations(false) + .fullscreen(false) + .inner_size(800.0, 636.0) + .min_inner_size(600.0, 520.0) + .build() + .err() + .and_then(|e| { + log::error!("{e}"); + Some(0) + }); } "system_proxy" => { let core = app_handle.state::(); @@ -91,10 +104,23 @@ fn main() -> std::io::Result<()> { }, #[cfg(target_os = "windows")] SystemTrayEvent::LeftClick { .. } => { - let window = app_handle.get_window("main").unwrap(); - window.unminimize().unwrap(); - window.show().unwrap(); - window.set_focus().unwrap(); + tauri::window::WindowBuilder::new( + app_handle, + "main".to_string(), + tauri::WindowUrl::App("index.html".into()), + ) + .title("Clash Verge") + .center() + .decorations(false) + .fullscreen(false) + .inner_size(800.0, 636.0) + .min_inner_size(600.0, 520.0) + .build() + .err() + .and_then(|e| { + log::error!("{e}"); + Some(0) + }); } _ => {} }) @@ -156,17 +182,8 @@ fn main() -> std::io::Result<()> { .build(tauri::generate_context!()) .expect("error while running tauri application") .run(|app_handle, e| match e { - tauri::RunEvent::WindowEvent { label, event, .. } => match event { - tauri::WindowEvent::CloseRequested { api, .. } => { - let app_handle = app_handle.clone(); - api.prevent_close(); - app_handle.get_window(&label).unwrap().hide().unwrap(); - } - _ => {} - }, - tauri::RunEvent::ExitRequested { .. } => { - resolve::resolve_reset(app_handle); - api::process::kill_children(); + tauri::RunEvent::ExitRequested { api, .. } => { + api.prevent_exit(); } tauri::RunEvent::Exit => { resolve::resolve_reset(app_handle); diff --git a/src/components/layout/layout-control.tsx b/src/components/layout/layout-control.tsx index 0bba354..379527b 100644 --- a/src/components/layout/layout-control.tsx +++ b/src/components/layout/layout-control.tsx @@ -30,7 +30,7 @@ const LayoutControl = () => { diff --git a/src/pages/_layout.tsx b/src/pages/_layout.tsx index 6fa1498..58e1c1f 100644 --- a/src/pages/_layout.tsx +++ b/src/pages/_layout.tsx @@ -35,7 +35,7 @@ const Layout = () => { useEffect(() => { window.addEventListener("keydown", (e) => { - if (e.key === "Escape") appWindow.hide(); + if (e.key === "Escape") appWindow.close(); }); listen("verge://refresh-clash-config", async () => { diff --git a/src/services/enhance.ts b/src/services/enhance.ts index a1ebf5a..803ee2e 100644 --- a/src/services/enhance.ts +++ b/src/services/enhance.ts @@ -1,4 +1,5 @@ -import { emit, listen } from "@tauri-apps/api/event"; +import { emit, listen, Event } from "@tauri-apps/api/event"; +import { appWindow } from "@tauri-apps/api/window"; import { CmdType } from "./types"; import ignoreCase from "../utils/ignore-case"; @@ -124,21 +125,29 @@ class Enhance { return this.resultMap.get(uid); } + async enhanceHandler(event: Event) { + const payload = event.payload as CmdType.EnhancedPayload; + + const result = await this.runner(payload).catch((err: any) => ({ + data: null, + status: "error", + error: err.message, + })); + + emit(payload.callback, JSON.stringify(result)).catch(console.error); + } // setup the handler setup() { if (this.isSetup) return; this.isSetup = true; listen("script-handler", async (event) => { - const payload = event.payload as CmdType.EnhancedPayload; + await this.enhanceHandler(event); + }); - const result = await this.runner(payload).catch((err: any) => ({ - data: null, - status: "error", - error: err.message, - })); - - emit(payload.callback, JSON.stringify(result)).catch(console.error); + listen("script-handler-close", async (event) => { + await this.enhanceHandler(event); + appWindow.close(); }); }