diff --git a/scripts/release-version.mjs b/scripts/release-version.mjs index 8c4d8f3f..b71f4f73 100644 --- a/scripts/release-version.mjs +++ b/scripts/release-version.mjs @@ -76,15 +76,15 @@ function getLatestTauriCommit() { function generateShortTimestamp(withCommit = false) { const now = new Date(); - const formatter = new Intl.DateTimeFormat('en-CA', { - timeZone: 'Asia/Shanghai', - month: '2-digit', - day: '2-digit' + const formatter = new Intl.DateTimeFormat("en-CA", { + timeZone: "Asia/Shanghai", + month: "2-digit", + day: "2-digit", }); const parts = formatter.formatToParts(now); - const month = parts.find(part => part.type === 'month').value; - const day = parts.find(part => part.type === 'day').value; + const month = parts.find((part) => part.type === "month").value; + const day = parts.find((part) => part.type === "day").value; if (withCommit) { const gitShort = getGitShortCommit(); diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index dd426eeb..c712436d 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -280,17 +280,16 @@ pub fn run() { let desktop_env = std::env::var("XDG_CURRENT_DESKTOP") .unwrap_or_default() .to_uppercase(); - let session_env = std::env::var("XDG_SESSION_TYPE").unwrap_or_default(); let is_kde_desktop = desktop_env.contains("KDE"); - let is_wayland_session = session_env.contains("wayland"); + let is_plasma_desktop = desktop_env.contains("PLASMA"); - if is_kde_desktop && is_wayland_session { - std::env::set_var("GDK_BACKEND", "x11"); + if is_kde_desktop || is_plasma_desktop { + std::env::set_var("GTK_CSD", "0"); logging!( info, Type::Setup, true, - "KDE Wayland detected: Switched to X11 backend for better titlebar stability." + "KDE detected: Disabled GTK CSD for better titlebar stability." ); } }