shkong/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev synced 2025-05-05 05:13:44 +08:00
Code Packages Projects Releases Activity

fix: Save wrong window size

Browse Source
This commit is contained in:
MystiPanda 2023-12-12 16:23:39 +08:00
parent d4ab1df870
commit 16fa2c9f5e
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src-tauri/src/main.rs
View File

@ -131,6 +131,9 @@ fn main() -> std::io::Result<()> {
tauri::RunEvent::WindowEvent { label, event, .. } => { tauri::RunEvent::WindowEvent { label, event, .. } => {
if label == "main" { if label == "main" {
match event { match event {
tauri::WindowEvent::Destroyed => {
let _ = resolve::save_window_size_position(&app_handle, true);
}
tauri::WindowEvent::CloseRequested { .. } => { tauri::WindowEvent::CloseRequested { .. } => {
let _ = resolve::save_window_size_position(&app_handle, true); let _ = resolve::save_window_size_position(&app_handle, true);
} }

15
src-tauri/src/utils/resolve.rs
View File

@ -195,6 +195,13 @@ pub fn create_window(app_handle: &AppHandle) {
/// save window size and position /// save window size and position
pub fn save_window_size_position(app_handle: &AppHandle, save_to_file: bool) -> Result<()> { pub fn save_window_size_position(app_handle: &AppHandle, save_to_file: bool) -> Result<()> {
let verge = Config::verge();
let mut verge = verge.latest();
if save_to_file {
verge.save_file()?;
}
let win = app_handle let win = app_handle
.get_window("main") .get_window("main")
.ok_or(anyhow::anyhow!("failed to get window"))?; .ok_or(anyhow::anyhow!("failed to get window"))?;
@ -205,12 +212,8 @@ pub fn save_window_size_position(app_handle: &AppHandle, save_to_file: bool) ->
let pos = win.outer_position()?; let pos = win.outer_position()?;
let pos = pos.to_logical::<f64>(scale); let pos = pos.to_logical::<f64>(scale);
let verge = Config::verge(); if size.width >= 600.0 && size.height >= 520.0 {
let mut verge = verge.latest(); verge.window_size_position = Some(vec![size.width, size.height, pos.x, pos.y]);
verge.window_size_position = Some(vec![size.width, size.height, pos.x, pos.y]);
if save_to_file {
verge.save_file()?;
} }
Ok(()) Ok(())