支持窗口自定义大小,修复不同分辨率屏幕间拖动时窗口大小异常

Author: Silwings-git

components.d.ts

@@ -8,7 +8,6 @@ export {}
 /* prettier-ignore */
 declare module 'vue' {
   export interface GlobalComponents {
-    ElHelp: typeof import('element-plus/es')['ElHelp']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']

src-tauri/src/constants.rs

@@ -6,3 +6,5 @@ lazy_static! {
 
 pub static APPLICATION_NAME: &str = "一键启动";
 pub static THEME: &str = "theme";
+pub static WINDOW_MIN_WIDTH: u32 = 800;
+pub static WINDOW_MIN_HEIGHT: u32 = 600;

src-tauri/src/events/system_listeners.rs

@@ -74,7 +74,7 @@ fn refresh_tray(app: &AppHandle) {
         if let Err(e) = window_api::refresh_tray(app_cloned).await {
             error!("刷新系统图标失败.{:?}", e);
         } else {
-            debug!("刷新系统图标失败成功.");
+            debug!("刷新系统图标成功.");
         }
     });
 }

src-tauri/src/lib.rs

@@ -1,14 +1,16 @@
 use crate::error::OneClickLaunchError;
 use anyhow::Result;
 use api::{launcher_api, setting_api};
-use constants::AUTO_START_FLAG;
+use constants::{AUTO_START_FLAG, WINDOW_MIN_HEIGHT, WINDOW_MIN_WIDTH};
 use db::{launcher, launcher_resource, settings};
 use events::EventDispatcher;
 use events::system_listeners::register_system_listeners;
 use events::types::{ApplicationStartupComplete, ApplicationStartupCompletePayload};
 use sqlx::{Executor, Sqlite};
 use sqlx::{SqlitePool, sqlite::SqlitePoolOptions};
 use std::path::PathBuf;
+use std::sync::Mutex;
+use std::time::Instant;
 use std::{env, fs};
 use tauri::Emitter;
 use tauri::tray::{MouseButton, MouseButtonState, TrayIcon, TrayIconEvent};
@@ -121,7 +123,7 @@ pub async fn run() -> Result<()> {
     tauri::Builder::default()
         .setup(move |app| {
             // 初始化窗口
-            setup_window(app.handle())?;
+            setup_tray(app.handle())?;
 
             // 注册监听器,之后添加新的监听器时在这个方法内部添加
             register_listeners(app.handle());
@@ -136,13 +138,11 @@ pub async fn run() -> Result<()> {
 
             Ok(())
         })
-        .on_window_event(|window, event| {
-            if let tauri::WindowEvent::CloseRequested { api, .. } = event {
-                api.prevent_close();
-                let _ = window.hide();
-            }
-        })
+        .on_window_event(handle_window_event)
         .manage(db_manager)
+        .manage(ScaleFactorChangedState {
+            last_reset: Mutex::new(None),
+        })
         // 优先注册单例插件
         .plugin(tauri_plugin_single_instance::init(|app, argv, cwd| {
             info!("{}, {argv:?}, {cwd}", app.package_info().name);
@@ -190,7 +190,7 @@ fn register_listeners(app: &AppHandle) {
 }
 
 /// 初始化窗口
-fn setup_window(app: &AppHandle) -> Result<()> {
+fn setup_tray(app: &AppHandle) -> Result<()> {
     let tray_icon = TrayIconBuilder::new()
         // 设置系统托盘的提示,鼠标悬浮时会显示
         .tooltip(constants::APPLICATION_NAME)
@@ -247,3 +247,64 @@ fn setup_window(app: &AppHandle) -> Result<()> {
 
     Ok(())
 }
+
+struct ScaleFactorChangedState {
+    last_reset: Mutex<Option<Instant>>,
+}
+
+fn handle_window_event(window: &tauri::Window, event: &tauri::WindowEvent) {
+    match event {
+        tauri::WindowEvent::CloseRequested { api, .. } => {
+            api.prevent_close();
+            let _ = window.hide();
+        }
+        tauri::WindowEvent::ScaleFactorChanged {
+            scale_factor,
+            new_inner_size,
+            ..
+        } => {
+            print!(
+                "ScaleFactorChanged scale_factor: {}, new_inner_size: {:?}",
+                scale_factor, new_inner_size
+            );
+
+            let now = Instant::now();
+            let state = window.state::<ScaleFactorChangedState>();
+            let mut lock = state.last_reset.try_lock();
+
+            if let Ok(ref mut last_reset) = lock {
+                // 500ms防抖间隔
+                if last_reset.map_or(true, |t| now.duration_since(t).as_millis() > 500) {
+                    if let Ok(physical_size) = window.inner_size() {
+                        // 如果窗口大小异常，强制调整到正常大小
+                        if physical_size.width != WINDOW_MIN_WIDTH
+                            || physical_size.height != WINDOW_MIN_HEIGHT
+                        {
+                            let _ = window.set_size(tauri::Size::Logical(tauri::LogicalSize {
+                                width: WINDOW_MIN_WIDTH as f64,
+                                height: WINDOW_MIN_HEIGHT as f64,
+                            }));
+                            **last_reset = Some(now);
+                            debug!("DPI发生变化,触发窗口大小重置");
+                        }
+                    }
+                } else {
+                    debug!("DPI重置窗口防抖生效");
+                }
+            }
+        }
+        tauri::WindowEvent::DragDrop(drag_drop_event) => todo!(),
+        tauri::WindowEvent::Resized(physical_size) => {
+            // 如果窗口大小过小，强制调整到正常大小
+            if physical_size.width < WINDOW_MIN_WIDTH || physical_size.height < WINDOW_MIN_HEIGHT {
+                let _ = window.set_size(tauri::Size::Logical(tauri::LogicalSize {
+                    width: WINDOW_MIN_WIDTH as f64,
+                    height: WINDOW_MIN_HEIGHT as f64,
+                }));
+                debug!("窗口大小过小，触发窗口大小重置");
+            }
+        }
+        _ => {         
+        }
+    }
+}

src-tauri/tauri.conf.json

@@ -18,9 +18,6 @@
         "height": 600,
         "minWidth": 800,
         "minHeight": 600,
-        "maxWidth": 800,
-        "maxHeight": 600,
-        "maximizable":false,
         "devtools": true
       }
     ],

src/home.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="home" style="margin: 0; padding: 0;">
+  <div class="home" style="margin: 0;">
     <div class="topbar">
       <button class="create-launcher-button" @click="createLauncher">创建新编组</button>
       <div class="topbar-button">
@@ -144,8 +144,8 @@ export default {
 <style scoped>
 .home {
   width: 100%;
-  height: 100%;
-  padding: 0px;
+  height: 98vh;
+  padding: 0px 0px 10px 0px;
   box-sizing: border-box;
   display: flex;
   flex-flow: column nowrap;
@@ -164,7 +164,7 @@ export default {
   padding: 10px 10px 10px 10px;
   scrollbar-width: auto;
   /* 调整滚动条宽度 */
-  /* flex:1; */
+  flex:1;
   /* height: clac(100vh -50px); */
 }
 
@@ -184,8 +184,6 @@ export default {
 .launcher-container>* {
   flex: 0 0 300px;
   width: 0;
-  /* 高度固定为 500px，和原始组件一致 */
-  height: 500px;
   padding: 10px 10px 10px 10px;
 }
 

src/launcher.vue

@@ -280,7 +280,7 @@ export default {
 <style scoped>
 .launcher {
     width: 300px;
-    height: 500px;
+    height: 100%;
     border: 1px solid #ccc;
     border-radius: 8px;
     padding: 10px;