chatterino2
Code Issues

Restore missing copy and pin buttons in the Usercard (#4533)

Browse Source
This commit is contained in:
nerix
2023-04-10 11:20:27 +02:00
committed by GitHub
parent 00642ef783
commit b3ade53229
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+1 -1
View File
@@ -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 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) - 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: 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: Ignore unhandled BTTV user-events. (#4438)
- Dev: Only log debug messages when NDEBUG is not defined. (#4442) - Dev: Only log debug messages when NDEBUG is not defined. (#4442)
- Dev: Cleaned up theme related code. (#4450) - Dev: Cleaned up theme related code. (#4450)
src/singletons/Theme.cpp
+13
View File
@@ -3,6 +3,7 @@
#include "Application.hpp" #include "Application.hpp"
#include "common/QLogging.hpp" #include "common/QLogging.hpp"
#include "singletons/Resources.hpp"
#include <QColor> #include <QColor>
#include <QFile> #include <QFile>
@@ -210,6 +211,18 @@ void Theme::parseFrom(const QJsonObject &root)
"selection-background-color:" + "selection-background-color:" +
(this->isLightTheme() ? "#68B1FF" (this->isLightTheme() ? "#68B1FF"
: this->tabs.selected.backgrounds.regular.name()); : 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 void Theme::normalizeColor(QColor &color) const