Skip to content

fix(gui): inherit wayland display and desktop styling for root GUI vi… #2445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jtrag wants to merge 1 commit into
base: dev
Choose a base branch
from
+7 −5
Open

fix(gui): inherit wayland display and desktop styling for root GUI vi… #2445

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions qt/backintime-qt_polkit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,16 @@
# General Public License v2 or any later version (GPL-2.0-or-later).
# See LICENSES directory or go to <https://spdx.org/licenses/CC0-1.0.html>
# and <https://spdx.org/licenses/GPL-2.0-or-later.html>.
# Inherit styling + display parameters to pkexec for root GUI
COMMON_VARS="QT_QPA_PLATFORMTHEME=$QT_QPA_PLATFORMTHEME QT_STYLE_OVERRIDE=$QT_STYLE_OVERRIDE XDG_CURRENT_DESKTOP=$XDG_CURRENT_DESKTOP DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS XDG_DATA_DIRS=$XDG_DATA_DIRS GTK_THEME=$GTK_THEME"

if [ "x$XDG_SESSION_TYPE" = "xwayland" ]; then
# PREFIX="env QT_QPA_PLATFORM=wayland-egl XDG_RUNTIME_DIR=$XDG_RUNTIME_DIR"
# Empty prefix to use the default Qt platform plugin (normally xcb)
# to fix #836 and #1350
PREFIX=""
# To fix Wayland Root GUI execution natively, pass WAYLAND_DISPLAY and XDG_RUNTIME_DIR
# This prevents 'backintime-qt (root)' from crashing on Pop!_OS COSMIC and other modern Wayland composites
PREFIX="env WAYLAND_DISPLAY=$WAYLAND_DISPLAY XDG_RUNTIME_DIR=$XDG_RUNTIME_DIR $COMMON_VARS"
else
# X11
PREFIX=""
PREFIX="env $COMMON_VARS"
fi

ERR_FILE=$(mktemp)
Expand Down