From 866ec2720d6b2b35d89eec04abd2e206bbb9a1a5 Mon Sep 17 00:00:00 2001 From: Tunglies Date: Thu, 22 May 2025 10:17:42 +0800 Subject: [PATCH] Revert "feat: integrate window state management for improved window restoration and logging" This reverts commit c9a9e934f4493efa3f191ca2a15e5a91c76bea53. --- src-tauri/src/lib.rs | 25 +++++++++++++++++-------- src-tauri/src/utils/resolve.rs | 7 ------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 3588e0361..3f02ca096 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -19,7 +19,6 @@ use tauri::AppHandle; use tauri::Manager; use tauri_plugin_autostart::MacosLauncher; use tauri_plugin_deep_link::DeepLinkExt; -use tauri_plugin_window_state::{AppHandleExt, StateFlags, WindowExt}; use tokio::time::{timeout, Duration}; use utils::logging::Type; @@ -138,13 +137,24 @@ pub fn run() { .plugin(tauri_plugin_dialog::init()) .plugin(tauri_plugin_shell::init()) .plugin(tauri_plugin_deep_link::init()) - .plugin( - tauri_plugin_window_state::Builder::new() - .with_state_flags(tauri_plugin_window_state::StateFlags::all()) - .skip_initial_state("main") - .build(), - ) .setup(|app| { + #[cfg(desktop)] + { + if let Err(e) = app.handle().plugin( + tauri_plugin_window_state::Builder::default() + .with_state_flags(tauri_plugin_window_state::StateFlags::all()) + .build(), + ) { + logging!( + error, + Type::Setup, + true, + "Failed to initialize tauri-plugin-window-state: {}", + e + ); + } + } + logging!(info, Type::Setup, true, "开始应用初始化..."); #[cfg(any(target_os = "linux", all(debug_assertions, windows)))] { @@ -332,7 +342,6 @@ pub fn run() { { logging!(info, Type::Window, true, "设置macOS窗口标题"); let _ = window.set_title("Clash Verge"); - logging_error!(Type::Window, true, window.restore_state(StateFlags::all())); } } } diff --git a/src-tauri/src/utils/resolve.rs b/src-tauri/src/utils/resolve.rs index c6ef7a295..5a15a34b5 100644 --- a/src-tauri/src/utils/resolve.rs +++ b/src-tauri/src/utils/resolve.rs @@ -17,7 +17,6 @@ use std::{ time::{Duration, Instant}, }; use tauri::{AppHandle, Manager}; -use tauri_plugin_window_state::WindowExt; use tokio::net::TcpListener; use tauri::Url; @@ -374,12 +373,6 @@ pub fn create_window(is_show: bool) -> bool { *get_ui_ready().write() = true; } } - logging_error!( - Type::Window, - true, - newly_created_window - .restore_state(tauri_plugin_window_state::StateFlags::all()) - ); logging!(info, Type::Window, true, "窗口显示流程完成"); } else { logging!(