d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-10-30 17:40:47 +03:00
Code Issues 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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/UserSettingsPage.cpp
View file

@ -663,7 +663,7 @@ UserSettings::applyTheme()
} else {
stylefile.setFileName(QStringLiteral(":/styles/styles/system.qss"));
}
QApplication::setPalette(Theme::paletteFromTheme(this->theme().toStdString()));
QApplication::setPalette(Theme::paletteFromTheme(this->theme()));
stylefile.open(QFile::ReadOnly);
QString stylesheet = QString(stylefile.readAll());

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()))

12
src/ui/Theme.cpp
View file

@ -7,11 +7,11 @@
Q_DECLARE_METATYPE(Theme)
QPalette
Theme::paletteFromTheme(std::string_view theme)
Theme::paletteFromTheme(QStringView theme)
{
[[maybe_unused]] static auto meta = qRegisterMetaType<Theme>("Theme");
static QPalette original;
if (theme == "light") {
if (theme == u"light") {
static QPalette lightActive = [] {
QPalette lightActive(
/*windowText*/ QColor(0x33, 0x33, 0x33),
@ -33,7 +33,7 @@ Theme::paletteFromTheme(std::string_view theme)
return lightActive;
}();
return lightActive;
} else if (theme == "dark") {
} else if (theme == u"dark") {
static QPalette darkActive = [] {
QPalette darkActive(
/*windowText*/ QColor(0xca, 0xcc, 0xd1),
@ -60,16 +60,16 @@ Theme::paletteFromTheme(std::string_view theme)
}
}
Theme::Theme(std::string_view theme)
Theme::Theme(QStringView theme)
{
auto p = paletteFromTheme(theme);
separator_ = p.mid().color();
if (theme == "light") {
if (theme == u"light") {
sidebarBackground_ = QColor(0x23, 0x36, 0x49);
alternateButton_ = QColor(0xcc, 0xcc, 0xcc);
red_ = QColor(0xa8, 0x23, 0x53);
orange_ = QColor(0xfc, 0xbe, 0x05);
} else if (theme == "dark") {
} else if (theme == u"dark") {
sidebarBackground_ = QColor(0x2d, 0x31, 0x39);
alternateButton_ = QColor(0x41, 0x4A, 0x59);
red_ = QColor(0xa8, 0x23, 0x53);

4
src/ui/Theme.h
View file

@ -66,8 +66,8 @@ class Theme : public QPalette
Q_PROPERTY(QColor orange READ orange CONSTANT)
public:
Theme() {}
explicit Theme(std::string_view theme);
static QPalette paletteFromTheme(std::string_view theme);
explicit Theme(QStringView theme);
static QPalette paletteFromTheme(QStringView theme);
QColor sidebarBackground() const { return sidebarBackground_; }
QColor alternateButton() const { return alternateButton_; }