From b3ade53229e9b00615f931bd385b91fbd83572df Mon Sep 17 00:00:00 2001 From: nerix Date: Mon, 10 Apr 2023 11:20:27 +0200 Subject: [PATCH] Restore missing copy and pin buttons in the Usercard (#4533) --- CHANGELOG.md | 2 +- src/singletons/Theme.cpp | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b540c6b8670..0509dd4fc67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,7 +21,7 @@ - Bugfix: Fixed a memory leak that occurred when loading message history. This was mostly noticeable with unstable internet connections where reconnections were frequent or long-running instances of Chatterino. (#4499) - Bugfix: Fixed emote & badge tooltips not showing up when thumbnails were hidden. (#4509) - Dev: Disabling precompiled headers on Windows is now tested in CI. (#4472) -- Dev: Themes are now stored as JSON files in `resources/themes`. (#4471) +- Dev: Themes are now stored as JSON files in `resources/themes`. (#4471, #4533) - Dev: Ignore unhandled BTTV user-events. (#4438) - Dev: Only log debug messages when NDEBUG is not defined. (#4442) - Dev: Cleaned up theme related code. (#4450) diff --git a/src/singletons/Theme.cpp b/src/singletons/Theme.cpp index 1a4263cc8cc..1b4f40cd2c4 100644 --- a/src/singletons/Theme.cpp +++ b/src/singletons/Theme.cpp @@ -3,6 +3,7 @@ #include "Application.hpp" #include "common/QLogging.hpp" +#include "singletons/Resources.hpp" #include #include @@ -210,6 +211,18 @@ void Theme::parseFrom(const QJsonObject &root) "selection-background-color:" + (this->isLightTheme() ? "#68B1FF" : this->tabs.selected.backgrounds.regular.name()); + + // Usercard buttons + if (this->isLightTheme()) + { + this->buttons.copy = getResources().buttons.copyDark; + this->buttons.pin = getResources().buttons.pinDisabledDark; + } + else + { + this->buttons.copy = getResources().buttons.copyLight; + this->buttons.pin = getResources().buttons.pinDisabledLight; + } } void Theme::normalizeColor(QColor &color) const