mirror of
https://github.com/farion1231/cc-switch.git
synced 2026-07-28 00:35:32 +08:00
Jason
64c068415e
Linux users reported the window UI (including native title bar buttons) couldn't receive clicks until manually maximizing and restoring the window. Root causes: (1) Tauri webview did not acquire focus on startup so first clicks were consumed by X11/Wayland click-to-activate (Tauri #10746, wry #637); (2) GTK surface input region failed to renegotiate on the visible:false + show() path under some WebKitGTK/compositor combinations. - Add linux_fix::nudge_main_window helper that performs set_focus plus a ±1px no-op resize after window show, with a 500ms reconciliation readback to compensate for dropped resize requests on slow compositors. - Wire the helper into every window re-show path: normal startup, deeplink, single_instance, tray show_main, and lightweight exit. - Set WEBKIT_DISABLE_COMPOSITING_MODE=1 at startup to avoid resize crashes and Wayland surface negotiation issues. - Remove data-tauri-drag-region on Linux from App.tsx header and the shared FullScreenPanel (used by all provider/MCP/workspace forms) to avoid Tauri #13440 in Wayland sessions. Extract drag-region constants to src/lib/platform.ts for reuse. All Rust changes are gated by #[cfg(target_os = "linux")]; frontend changes preserve macOS/Windows behavior via runtime isLinux() checks. Known limitation: tiling Wayland compositors ignore set_size, so GDK_BACKEND=x11 remains the user-side workaround.
99 lines
2.7 KiB
Rust
99 lines
2.7 KiB
Rust
use std::sync::atomic::{AtomicBool, Ordering};
|
|
|
|
use tauri::Manager;
|
|
|
|
static LIGHTWEIGHT_MODE: AtomicBool = AtomicBool::new(false);
|
|
|
|
pub fn enter_lightweight_mode(app: &tauri::AppHandle) -> Result<(), String> {
|
|
#[cfg(target_os = "windows")]
|
|
{
|
|
if let Some(window) = app.get_webview_window("main") {
|
|
let _ = window.set_skip_taskbar(true);
|
|
}
|
|
}
|
|
#[cfg(target_os = "macos")]
|
|
{
|
|
crate::tray::apply_tray_policy(app, false);
|
|
}
|
|
|
|
if let Some(window) = app.get_webview_window("main") {
|
|
window
|
|
.destroy()
|
|
.map_err(|e| format!("销毁主窗口失败: {e}"))?;
|
|
}
|
|
// else: already in lightweight mode or window not found, just set the flag
|
|
|
|
LIGHTWEIGHT_MODE.store(true, Ordering::Release);
|
|
crate::tray::refresh_tray_menu(app);
|
|
log::info!("进入轻量模式");
|
|
Ok(())
|
|
}
|
|
|
|
pub fn exit_lightweight_mode(app: &tauri::AppHandle) -> Result<(), String> {
|
|
use tauri::WebviewWindowBuilder;
|
|
|
|
if let Some(window) = app.get_webview_window("main") {
|
|
let _ = window.unminimize();
|
|
let _ = window.show();
|
|
let _ = window.set_focus();
|
|
#[cfg(target_os = "linux")]
|
|
{
|
|
crate::linux_fix::nudge_main_window(window.clone());
|
|
}
|
|
#[cfg(target_os = "windows")]
|
|
{
|
|
let _ = window.set_skip_taskbar(false);
|
|
}
|
|
#[cfg(target_os = "macos")]
|
|
{
|
|
crate::tray::apply_tray_policy(app, true);
|
|
}
|
|
LIGHTWEIGHT_MODE.store(false, Ordering::Release);
|
|
crate::tray::refresh_tray_menu(app);
|
|
log::info!("退出轻量模式");
|
|
return Ok(());
|
|
}
|
|
|
|
let window_config = app
|
|
.config()
|
|
.app
|
|
.windows
|
|
.iter()
|
|
.find(|w| w.label == "main")
|
|
.ok_or("主窗口配置未找到")?;
|
|
|
|
WebviewWindowBuilder::from_config(app, window_config)
|
|
.map_err(|e| format!("加载主窗口配置失败: {e}"))?
|
|
.visible(true)
|
|
.build()
|
|
.map_err(|e| format!("创建主窗口失败: {e}"))?;
|
|
|
|
if let Some(window) = app.get_webview_window("main") {
|
|
let _ = window.set_focus();
|
|
#[cfg(target_os = "linux")]
|
|
{
|
|
crate::linux_fix::nudge_main_window(window.clone());
|
|
}
|
|
}
|
|
|
|
#[cfg(target_os = "windows")]
|
|
{
|
|
if let Some(window) = app.get_webview_window("main") {
|
|
let _ = window.set_skip_taskbar(false);
|
|
}
|
|
}
|
|
#[cfg(target_os = "macos")]
|
|
{
|
|
crate::tray::apply_tray_policy(app, true);
|
|
}
|
|
|
|
LIGHTWEIGHT_MODE.store(false, Ordering::Release);
|
|
crate::tray::refresh_tray_menu(app);
|
|
log::info!("退出轻量模式");
|
|
Ok(())
|
|
}
|
|
|
|
pub fn is_lightweight_mode() -> bool {
|
|
LIGHTWEIGHT_MODE.load(Ordering::Acquire)
|
|
}
|