griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #133921: Borderless windows on Wayland when run from VSCode

Browse Source 
Workaround a problem where Electron overrides XDG_CURRENT_DESKTOP
by checking if an "ORIGINAL_" prefixed version of the variable.
This commit is contained in:
Campbell Barton
2025-02-03 19:35:11 +11:00
parent 27b9173081
commit ded798ba28
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
intern/ghost/intern/GHOST_SystemWayland.cc
View File

@@ -7411,11 +7411,21 @@ GHOST_SystemWayland::GHOST_SystemWayland(bool background)
#ifdef WITH_GHOST_WAYLAND_LIBDECOR
bool libdecor_required = false;
if (const char *xdg_current_desktop = getenv("XDG_CURRENT_DESKTOP")) {
/* See the free-desktop specifications for details on `XDG_CURRENT_DESKTOP`.
* https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html */
if (string_elem_split_by_delim(xdg_current_desktop, ':', "GNOME")) {
libdecor_required = true;
{
const char *xdg_current_desktop = [] {
/* Account for VSCode overriding this value (tsk!), see: #133921. */
const char *key = "ORIGINAL_XDG_CURRENT_DESKTOP";
const char *value = getenv(key);
return value ? value : getenv(key + 9);
}();
if (xdg_current_desktop) {
/* See the free-desktop specifications for details on `XDG_CURRENT_DESKTOP`.
* https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html
*/
if (string_elem_split_by_delim(xdg_current_desktop, ':', "GNOME")) {
libdecor_required = true;
}
}
}

7
source/blender/blenlib/intern/fileops_c.cc
View File

@@ -1212,7 +1212,12 @@ int BLI_delete_soft(const char *filepath, const char **r_error_message)
/* May contain `:` delimiter characters according to version 1.5 of the spec:
* https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html */
const char *xdg_current_desktop = getenv("XDG_CURRENT_DESKTOP");
const char *xdg_current_desktop = [] {
/* Account for VSCode overriding this value (tsk!), see: #133921. */
const char *key = "ORIGINAL_XDG_CURRENT_DESKTOP";
const char *value = getenv(key);
return value ? value : getenv(key + 9);
}();
const char *xdg_session_desktop = getenv("XDG_SESSION_DESKTOP");
if ((xdg_current_desktop && BLI_string_elem_split_by_delim(xdg_current_desktop, ':', "KDE")) ||