feat: 支持 Windows 平台不抢占其他窗口焦点

Author: ayangweb

package.json

@@ -5,7 +5,7 @@
 		"name": "ayangweb",
 		"email": "ayangweb@foxmail.com"
 	},
-	"version": "0.6.0-beta.3",
+	"version": "0.6.0-beta.4",
 	"type": "module",
 	"scripts": {
 		"dev": "run-s build:icon dev:vite",

src-tauri/src/plugins/paste/src/commands/macos.rs

@@ -9,7 +9,7 @@ use std::process::Command;
 use std::sync::Mutex;
 use std::thread;
 use tauri::{command, AppHandle, Runtime, WebviewWindow};
-use tauri_plugin_eco_window::{set_macos_panel, MacOSPanelStatus, MAIN_WINDOW_TITLE};
+use tauri_plugin_eco_window::{set_ns_panel, NsPanelStatus, MAIN_WINDOW_TITLE};
 
 static PREVIOUS_WINDOW: Mutex<Option<i32>> = Mutex::new(None);
 
@@ -82,7 +82,7 @@ pub fn get_previous_window() -> Option<i32> {
 // 粘贴
 #[command]
 pub async fn paste<R: Runtime>(app_handle: AppHandle<R>, window: WebviewWindow<R>) {
-    set_macos_panel(&app_handle, &window, MacOSPanelStatus::Resign);
+    set_ns_panel(&app_handle, &window, NsPanelStatus::Resign);
 
     let script = r#"tell application "System Events" to keystroke "v" using command down"#;
 

…plugins/window/src/commands/not_macos.rs …src/plugins/window/src/commands/linux.rssrc-tauri/src/plugins/window/src/commands/not_macos.rs renamed to src-tauri/src/plugins/window/src/commands/linux.rs src-tauri/src/plugins/window/src/commands/not_macos.rs renamed to src-tauri/src/plugins/window/src/commands/linux.rs

@@ -1,16 +1,17 @@
-use super::{shared_hide_window, shared_show_window};
 use tauri::{command, AppHandle, Runtime, WebviewWindow};
 
 // 显示窗口
 #[command]
 pub async fn show_window<R: Runtime>(_app_handle: AppHandle<R>, window: WebviewWindow<R>) {
-    shared_show_window(&window);
+    let _ = window.show();
+    let _ = window.unminimize();
+    let _ = window.set_focus();
 }
 
 // 隐藏窗口
 #[command]
 pub async fn hide_window<R: Runtime>(_app_handle: AppHandle<R>, window: WebviewWindow<R>) {
-    shared_hide_window(&window);
+    let _ = window.hide();
 }
 
 // 显示任务栏图标

src-tauri/src/plugins/window/src/commands/macos.rs

@@ -1,9 +1,9 @@
-use super::{is_main_window, shared_hide_window, shared_show_window};
+use super::is_main_window;
 use crate::MAIN_WINDOW_LABEL;
 use tauri::{command, AppHandle, Runtime, WebviewWindow};
 use tauri_nspanel::{CollectionBehavior, ManagerExt};
 
-pub enum MacOSPanelStatus {
+pub enum NsPanelStatus {
     Show,
     Hide,
     Resign,
@@ -13,19 +13,21 @@ pub enum MacOSPanelStatus {
 #[command]
 pub async fn show_window<R: Runtime>(app_handle: AppHandle<R>, window: WebviewWindow<R>) {
     if is_main_window(&window) {
-        set_macos_panel(&app_handle, &window, MacOSPanelStatus::Show);
+        set_ns_panel(&app_handle, &window, NsPanelStatus::Show);
     } else {
-        shared_show_window(&window);
+        let _ = window.show();
+        let _ = window.unminimize();
+        let _ = window.set_focus();
     }
 }
 
 // 隐藏窗口
 #[command]
 pub async fn hide_window<R: Runtime>(app_handle: AppHandle<R>, window: WebviewWindow<R>) {
     if is_main_window(&window) {
-        set_macos_panel(&app_handle, &window, MacOSPanelStatus::Hide);
+        set_ns_panel(&app_handle, &window, NsPanelStatus::Hide);
     } else {
-        shared_hide_window(&window);
+        let _ = window.hide();
     }
 }
 
@@ -40,18 +42,18 @@ pub async fn show_taskbar_icon<R: Runtime>(
 }
 
 // 设置 macos 的 ns_panel 的状态
-pub fn set_macos_panel<R: Runtime>(
+pub fn set_ns_panel<R: Runtime>(
     app_handle: &AppHandle<R>,
     window: &WebviewWindow<R>,
-    status: MacOSPanelStatus,
+    status: NsPanelStatus,
 ) {
     if is_main_window(window) {
         let app_handle_clone = app_handle.clone();
 
         let _ = app_handle.run_on_main_thread(move || {
             if let Ok(panel) = app_handle_clone.get_webview_panel(MAIN_WINDOW_LABEL) {
                 match status {
-                    MacOSPanelStatus::Show => {
+                    NsPanelStatus::Show => {
                         panel.show_and_make_key();
 
                         panel.set_collection_behavior(
@@ -62,7 +64,7 @@ pub fn set_macos_panel<R: Runtime>(
                                 .into(),
                         );
                     }
-                    MacOSPanelStatus::Hide => {
+                    NsPanelStatus::Hide => {
                         panel.hide();
 
                         panel.set_collection_behavior(
@@ -73,7 +75,7 @@ pub fn set_macos_panel<R: Runtime>(
                                 .into(),
                         );
                     }
-                    MacOSPanelStatus::Resign => {
+                    NsPanelStatus::Resign => {
                         panel.resign_key_window();
                     }
                 }

src-tauri/src/plugins/window/src/commands/mod.rs

@@ -10,32 +10,26 @@ pub static MAIN_WINDOW_TITLE: &str = "EcoPaste";
 #[cfg(target_os = "macos")]
 mod macos;
 
-#[cfg(not(target_os = "macos"))]
-mod not_macos;
+#[cfg(target_os = "windows")]
+mod windows;
+
+#[cfg(target_os = "linux")]
+mod linux;
 
 #[cfg(target_os = "macos")]
 pub use macos::*;
 
-#[cfg(not(target_os = "macos"))]
-pub use not_macos::*;
+#[cfg(target_os = "windows")]
+pub use windows::*;
+
+#[cfg(target_os = "linux")]
+pub use linux::*;
 
 // 是否为主窗口
 pub fn is_main_window<R: Runtime>(window: &WebviewWindow<R>) -> bool {
     window.label() == MAIN_WINDOW_LABEL
 }
 
-// 共享显示窗口的方法
-fn shared_show_window<R: Runtime>(window: &WebviewWindow<R>) {
-    let _ = window.show();
-    let _ = window.unminimize();
-    let _ = window.set_focus();
-}
-
-// 共享隐藏窗口的方法
-fn shared_hide_window<R: Runtime>(window: &WebviewWindow<R>) {
-    let _ = window.hide();
-}
-
 // 显示主窗口
 pub fn show_main_window(app_handle: &AppHandle) {
     show_window_by_label(app_handle, MAIN_WINDOW_LABEL);

src-tauri/src/plugins/window/src/commands/windows.rs

@@ -0,0 +1,31 @@
+use super::is_main_window;
+use tauri::{command, AppHandle, Runtime, WebviewWindow};
+
+// 显示窗口
+#[command]
+pub async fn show_window<R: Runtime>(_app_handle: AppHandle<R>, window: WebviewWindow<R>) {
+    let _ = window.show();
+    let _ = window.unminimize();
+
+    if is_main_window(&window) {
+        let _ = window.set_focusable(false);
+    } else {
+        let _ = window.set_focus();
+    }
+}
+
+// 隐藏窗口
+#[command]
+pub async fn hide_window<R: Runtime>(_app_handle: AppHandle<R>, window: WebviewWindow<R>) {
+    let _ = window.hide();
+}
+
+// 显示任务栏图标
+#[command]
+pub async fn show_taskbar_icon<R: Runtime>(
+    _app_handle: AppHandle<R>,
+    window: WebviewWindow<R>,
+    visible: bool,
+) {
+    let _ = window.set_skip_taskbar(!visible);
+}