mirror/clash-verge-rev-lite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 11 Wiki Activity

Revert "fix: auto-detect KDE/Plasma and switch to X11 as backend to fix titlebar button freeze (#4523)"

Browse Source 
This reverts commit d58c0a7df5.
This commit is contained in:
Tunglies
2025-09-06 11:58:52 +08:00
parent feb3dfbe86
commit f70b8b1213
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/release-version.mjs
View File

@@ -76,15 +76,15 @@ function getLatestTauriCommit() {
function generateShortTimestamp(withCommit = false) { function generateShortTimestamp(withCommit = false) {
const now = new Date(); const now = new Date();
const formatter = new Intl.DateTimeFormat('en-CA', { const formatter = new Intl.DateTimeFormat("en-CA", {
timeZone: 'Asia/Shanghai', timeZone: "Asia/Shanghai",
month: '2-digit', month: "2-digit",
day: '2-digit' day: "2-digit",
}); });
const parts = formatter.formatToParts(now); const parts = formatter.formatToParts(now);
const month = parts.find(part => part.type === 'month').value; const month = parts.find((part) => part.type === "month").value;
const day = parts.find(part => part.type === 'day').value; const day = parts.find((part) => part.type === "day").value;
if (withCommit) { if (withCommit) {
const gitShort = getGitShortCommit(); const gitShort = getGitShortCommit();

9
src-tauri/src/lib.rs
View File

@@ -280,17 +280,16 @@ pub fn run() {
let desktop_env = std::env::var("XDG_CURRENT_DESKTOP") let desktop_env = std::env::var("XDG_CURRENT_DESKTOP")
.unwrap_or_default() .unwrap_or_default()
.to_uppercase(); .to_uppercase();
let session_env = std::env::var("XDG_SESSION_TYPE").unwrap_or_default();
let is_kde_desktop = desktop_env.contains("KDE"); 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 { if is_kde_desktop || is_plasma_desktop {
std::env::set_var("GDK_BACKEND", "x11"); std::env::set_var("GTK_CSD", "0");
logging!( logging!(
info, info,
Type::Setup, Type::Setup,
true, true,
"KDE Wayland detected: Switched to X11 backend for better titlebar stability." "KDE detected: Disabled GTK CSD for better titlebar stability."
); );
} }
} }