1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gtk3Theme: set XCURSOR_SIZE and XCURSOR_THEME for wayland sessions

Browse Source 
GNOME doesn't set these for Wayland session and without those env
variables set users might experience broken cursor with Qt apps
as QWayland reads them to setup QWaylandInputDevice.

There is no cursor protocol available on Wayland yet, see also
https://gitlab.freedesktop.org/wayland/wayland-protocols/-/issues/58

Qt Wayland QPA plugin still tries to load from those two envs.

Fixes: QTBUG-67579
Fixes: QTBUG-87778
Change-Id: I4e7f6871b56599170b12e796858238b1df6d47d1
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
(cherry picked from commit c0b0c7bebb73e1aa609196ce33668a54bd5e0aef)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Jan Grulich 2022-01-11 15:38:08 +01:00 committed by Qt Cherry-pick Bot
parent c28ad246d1
commit 1958c523e9
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/platformthemes/gtk3/qgtk3theme.cpp
View File

@ -102,6 +102,20 @@ QGtk3Theme::QGtk3Theme()
SETTING_CONNECT("gtk-application-prefer-dark-theme");
SETTING_CONNECT("gtk-theme-name");
#undef SETTING_CONNECT
/* Set XCURSOR_SIZE and XCURSOR_THEME for Wayland sessions */
if (QGuiApplication::platformName().startsWith("wayland"_L1)) {
if (qEnvironmentVariableIsEmpty("XCURSOR_SIZE")) {
const int cursorSize = gtkSetting<gint>("gtk-cursor-theme-size");
if (cursorSize > 0)
qputenv("XCURSOR_SIZE", QString::number(cursorSize).toUtf8());
}
if (qEnvironmentVariableIsEmpty("XCURSOR_THEME")) {
const QString cursorTheme = gtkSetting("gtk-cursor-theme-name");
if (!cursorTheme.isEmpty())
qputenv("XCURSOR_THEME", cursorTheme.toUtf8());
}
}
}
static inline QVariant gtkGetLongPressTime()