void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fallback to portal on Linux if QStyleHints::colorScheme is unknown

Browse source
This commit is contained in:
Ilya Fedin 2024-10-12 09:58:40 +04:00 • committed by John Preston
parent f2e0e481de
commit a88f48cd93
3 changed files with 45 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
Telegram/SourceFiles/platform/linux/integration_linux.cpp
View file

@ -17,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "base/random.h" #include "base/random.h"
#include <QtCore/QAbstractEventDispatcher> #include <QtCore/QAbstractEventDispatcher>
#include <QtGui/QStyleHints>
#include <gio/gio.hpp> #include <gio/gio.hpp>
#include <xdpinhibit/xdpinhibit.hpp> #include <xdpinhibit/xdpinhibit.hpp>
@ -189,24 +190,30 @@ private:
const gi::ref_ptr<Application> _application; const gi::ref_ptr<Application> _application;
XdpInhibit::InhibitProxy _inhibitProxy; XdpInhibit::InhibitProxy _inhibitProxy;
#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0) rpl::variable<std::optional<bool>> _darkMode;
base::Platform::XDP::SettingWatcher _darkModeWatcher; base::Platform::XDP::SettingWatcher _darkModeWatcher;
#endif // Qt < 6.5.0 rpl::lifetime _lifetime;
}; };
LinuxIntegration::LinuxIntegration() LinuxIntegration::LinuxIntegration()
: _application(MakeApplication()) : _application(MakeApplication())
#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0) , _darkMode([]() -> std::optional<bool> {
if (auto value = base::Platform::XDP::ReadSetting(
"org.freedesktop.appearance",
"color-scheme")) {
return value->get_uint32() == 1;
}
return std::nullopt;
})
, _darkModeWatcher( , _darkModeWatcher(
"org.freedesktop.appearance", "org.freedesktop.appearance",
"color-scheme", "color-scheme",
[](GLib::Variant value) { [=](GLib::Variant value) {
Core::Sandbox::Instance().customEnterFromEventLoop([&] { Core::Sandbox::Instance().customEnterFromEventLoop([&] {
Core::App().settings().setSystemDarkMode(value.get_uint32() == 1); _darkMode = value.get_uint32() == 1;
}); });
}) }
#endif // Qt < 6.5.0 ) {
{
LOG(("Icon theme: %1").arg(QIcon::themeName())); LOG(("Icon theme: %1").arg(QIcon::themeName()));
LOG(("Fallback icon theme: %1").arg(QIcon::fallbackThemeName())); LOG(("Fallback icon theme: %1").arg(QIcon::fallbackThemeName()));
@ -230,6 +237,30 @@ void LinuxIntegration::init() {
initInhibit(); initInhibit();
})); }));
_darkMode.value()
#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
| rpl::filter([] {
return QGuiApplication::styleHints()->colorScheme()
== Qt::ColorScheme::Unknown;
})
#endif // Qt >= 6.5.0
| rpl::start_with_next([](std::optional<bool> value) {
Core::App().settings().setSystemDarkMode(value);
}, _lifetime);
#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
Core::App().settings().systemDarkModeValue(
) | rpl::filter([=](std::optional<bool> value) {
return !value && _darkMode.current();
}) | rpl::start_with_next([=] {
crl::on_main(this, [=] {
if (!Core::App().settings().systemDarkMode()) {
Core::App().settings().setSystemDarkMode(_darkMode.current());
}
});
}, _lifetime);
#endif // Qt >= 6.5.0
} }
void LinuxIntegration::initInhibit() { void LinuxIntegration::initInhibit() {

8
Telegram/SourceFiles/platform/linux/specific_linux.cpp
View file

@ -536,13 +536,7 @@ QString SingleInstanceLocalServerName(const QString &hash) {
#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0) #if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
std::optional<bool> IsDarkMode() { std::optional<bool> IsDarkMode() {
auto result = base::Platform::XDP::ReadSetting( return std::nullopt;
"org.freedesktop.appearance",
"color-scheme");
return result.has_value()
? std::make_optional(result->get_uint32() == 1)
: std::nullopt;
} }
#endif // Qt < 6.5.0 #endif // Qt < 6.5.0

6
Telegram/SourceFiles/window/themes/window_theme.cpp
View file

@ -529,6 +529,8 @@ void ChatBackground::start() {
#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
rpl::single( rpl::single(
QGuiApplication::styleHints()->colorScheme() QGuiApplication::styleHints()->colorScheme()
) | rpl::filter(
rpl::mappers::_1 != Qt::ColorScheme::Unknown
) | rpl::then( ) | rpl::then(
base::qt_signal_producer( base::qt_signal_producer(
QGuiApplication::styleHints(), QGuiApplication::styleHints(),
@ -542,7 +544,9 @@ void ChatBackground::start() {
Core::App().settings().setSystemDarkMode(dark); Core::App().settings().setSystemDarkMode(dark);
}, _lifetime); }, _lifetime);
#else // Qt >= 6.5.0 #else // Qt >= 6.5.0
Core::App().settings().setSystemDarkMode(Platform::IsDarkMode()); if (const auto dark = Platform::IsDarkMode()) {
Core::App().settings().setSystemDarkMode(dark);
}
#endif // Qt < 6.5.0 #endif // Qt < 6.5.0
} }