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

GnomeTheme: read the initial color-scheme value from dbus

Browse Source 
The initial color-scheme value was never initialized, and would thus,
always be 'Unknown', until the user changes the color scheme in the
system settings.

The xdg settings portal method ReadAll is currently omitting the
contrast setting from the reply. Because of this, two separate dbus
calls are necessary to get both the initial color-scheme and contrast
setting.

Change-Id: Ie32371efd830e19727922efd2c9c32595395d11a
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
This commit is contained in:
Oliver Eftevaag 2025-03-28 09:56:27 +01:00
parent 4ac89dad78
commit 49f05b043e
1 changed files with 39 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/gui/platform/unix/qgnometheme.cpp
View File

@ -31,30 +31,51 @@ const char *QGnomeTheme::name = "gnome";
QGnomeThemePrivate::QGnomeThemePrivate() QGnomeThemePrivate::QGnomeThemePrivate()
{ {
#ifndef QT_NO_DBUS #ifndef QT_NO_DBUS
static constexpr QLatin1String appearanceNamespace("org.freedesktop.appearance");
static constexpr QLatin1String colorSchemeKey("color-scheme");
static constexpr QLatin1String contrastKey("contrast");
QDBusConnection dbus = QDBusConnection::sessionBus();
if (dbus.isConnected()) {
// ReadAll appears to omit the contrast setting on Ubuntu.
QDBusMessage message = QDBusMessage::createMethodCall(QLatin1String("org.freedesktop.portal.Desktop"), QDBusMessage message = QDBusMessage::createMethodCall(QLatin1String("org.freedesktop.portal.Desktop"),
QLatin1String("/org/freedesktop/portal/desktop"), QLatin1String("/org/freedesktop/portal/desktop"),
QLatin1String("org.freedesktop.portal.Settings"), QLatin1String("org.freedesktop.portal.Settings"),
QLatin1String("ReadOne")); QLatin1String("ReadOne"));
static constexpr QLatin1String appearanceNamespace("org.freedesktop.appearance");
static constexpr QLatin1String contrastKey("contrast");
message << appearanceNamespace << colorSchemeKey;
QDBusReply<QVariant> reply = dbus.call(message);
if (Q_LIKELY(reply.isValid())) {
uint xdgColorSchemeValue = reply.value().toUInt();
switch (xdgColorSchemeValue) {
case 1:
m_colorScheme = Qt::ColorScheme::Dark;
QWindowSystemInterface::handleThemeChange();
break;
case 2:
m_colorScheme = Qt::ColorScheme::Light;
QWindowSystemInterface::handleThemeChange();
break;
default:
break;
}
}
message.setArguments({});
message << appearanceNamespace << contrastKey; message << appearanceNamespace << contrastKey;
QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(dbus.asyncCall(message));
QDBusConnection dbus = QDBusConnection::sessionBus();
if (!dbus.isConnected())
qCWarning(lcQpaThemeGnome) << "dbus connection failed. Last error: " << dbus.lastError();
QDBusPendingCall pendingCall = dbus.asyncCall(message);
QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingCall);
QObject::connect(watcher, &QDBusPendingCallWatcher::finished, watcher, [this](QDBusPendingCallWatcher *watcher) { QObject::connect(watcher, &QDBusPendingCallWatcher::finished, watcher, [this](QDBusPendingCallWatcher *watcher) {
if (!watcher->isError()) { if (!watcher->isError()) {
QDBusPendingReply<QVariant> reply = *watcher; QDBusPendingReply<QVariant> reply = *watcher;
if (Q_LIKELY(reply.isValid())) if (Q_LIKELY(reply.isValid()))
m_contrast = static_cast<Qt::ContrastPreference>(reply.value().toUInt()); updateHighContrast(static_cast<Qt::ContrastPreference>(reply.value().toUInt()));
} }
watcher->deleteLater();
initDbus(); initDbus();
watcher->deleteLater();
}); });
} else {
qCWarning(lcQpaThemeGnome) << "dbus connection failed. Last error: " << dbus.lastError();
}
#endif // QT_NO_DBUS #endif // QT_NO_DBUS
} }
QGnomeThemePrivate::~QGnomeThemePrivate() QGnomeThemePrivate::~QGnomeThemePrivate()