thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prevent copies when querying theme

Browse source
This commit is contained in:
Nicolas Werner 2021-12-29 08:05:29 +01:00
parent f21bf5f97e
commit 497c3df50e
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
4 changed files with 38 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/ui/NhekoGlobalObject.cpp
View file

@ -38,21 +38,41 @@ Nheko::updateUserProfile()
QPalette
Nheko::colors() const
{
return Theme::paletteFromTheme(UserSettings::instance()->theme().toStdString());
return Theme::paletteFromTheme(UserSettings::instance()->theme());
}
QPalette
Nheko::inactiveColors() const
{
auto p = colors();
p.setCurrentColorGroup(QPalette::ColorGroup::Inactive);
return p;
auto theme = UserSettings::instance()->theme();
if (theme == QLatin1String("light")) {
static QPalette lightInactive = [] {
auto lightInactive = Theme::paletteFromTheme(u"light");
lightInactive.setCurrentColorGroup(QPalette::ColorGroup::Inactive);
return lightInactive;
}();
return lightInactive;
} else if (theme == QLatin1String("dark")) {
static QPalette darkInactive = [] {
auto darkInactive = Theme::paletteFromTheme(u"dark");
darkInactive.setCurrentColorGroup(QPalette::ColorGroup::Inactive);
return darkInactive;
}();
return darkInactive;
} else {
static QPalette originalInactive = [] {
auto originalInactive = Theme::paletteFromTheme(u"system");
originalInactive.setCurrentColorGroup(QPalette::ColorGroup::Inactive);
return originalInactive;
}();
return originalInactive;
}
}
Theme
Nheko::theme() const
{
return Theme(UserSettings::instance()->theme().toStdString());
return Theme(UserSettings::instance()->theme());
}
void
@ -61,10 +81,10 @@ Nheko::openLink(QString link) const
QUrl url(link);
// Open externally if we couldn't handle it internally
if (!ChatPage::instance()->handleMatrixUri(url)) {
const QStringList allowedUrlSchemes = {
"http",
"https",
"mailto",
static const QStringList allowedUrlSchemes = {
QStringLiteral("http"),
QStringLiteral("https"),
QStringLiteral("mailto"),
};
if (allowedUrlSchemes.contains(url.scheme()))