diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f29536b..0a18cc9d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
- Minor: Received IRC messages use `time` message tag for timestamp if it's available. (#3021)
- Minor: Added informative messages for recent-messages API's errors. (#3029)
- Bugfix: Fixed "smiley" emotes being unable to be "Tabbed" with autocompletion, introduced in v2.3.3. (#3010)
+- Bugfix: Copy buttons in usercard now show properly in light mode (#3057)
- Bugfix: Fixed comma appended to username completion when not at the beginning of the message. (#3060)
- Dev: Ubuntu packages are now available (#2936)
- Dev: Disabled update checker on Flatpak. (#3051)
diff --git a/resources/buttons/copyDark.png b/resources/buttons/copyDark.png
index 2a663bfd..a0b633ee 100644
Binary files a/resources/buttons/copyDark.png and b/resources/buttons/copyDark.png differ
diff --git a/resources/buttons/copyDark.svg b/resources/buttons/copyDark.svg
index ed30f70a..5fddace4 100644
--- a/resources/buttons/copyDark.svg
+++ b/resources/buttons/copyDark.svg
@@ -9,5 +9,5 @@
height="368.64pt"
viewBox="0 0 368.64 368.64">
-
+
diff --git a/resources/buttons/copyLight.png b/resources/buttons/copyLight.png
index a0b633ee..2a663bfd 100644
Binary files a/resources/buttons/copyLight.png and b/resources/buttons/copyLight.png differ
diff --git a/resources/buttons/copyLight.svg b/resources/buttons/copyLight.svg
index 5fddace4..ed30f70a 100644
--- a/resources/buttons/copyLight.svg
+++ b/resources/buttons/copyLight.svg
@@ -9,5 +9,5 @@
height="368.64pt"
viewBox="0 0 368.64 368.64">
-
+
diff --git a/src/singletons/Theme.cpp b/src/singletons/Theme.cpp
index 13e01bf8..2e73d170 100644
--- a/src/singletons/Theme.cpp
+++ b/src/singletons/Theme.cpp
@@ -1,12 +1,15 @@
-#define LOOKUP_COLOR_COUNT 360
#include "singletons/Theme.hpp"
+
#include "Application.hpp"
+#include "singletons/Resources.hpp"
#include
#include
+#define LOOKUP_COLOR_COUNT 360
+
namespace chatterino {
Theme::Theme()
@@ -80,6 +83,16 @@ void Theme::actuallyUpdate(double hue, double multiplier)
this->splits.background = getColor(0, sat, 1);
this->splits.dropPreview = QColor(0, 148, 255, 0x30);
this->splits.dropPreviewBorder = QColor(0, 148, 255, 0xff);
+
+ // Copy button
+ if (this->isLightTheme())
+ {
+ this->buttons.copy = getResources().buttons.copyDark;
+ }
+ else
+ {
+ this->buttons.copy = getResources().buttons.copyLight;
+ }
}
void Theme::normalizeColor(QColor &color)
diff --git a/src/singletons/Theme.hpp b/src/singletons/Theme.hpp
index 99905fa8..8b55dbab 100644
--- a/src/singletons/Theme.hpp
+++ b/src/singletons/Theme.hpp
@@ -48,6 +48,10 @@ public:
} input;
} splits;
+ struct {
+ QPixmap copy;
+ } buttons;
+
void normalizeColor(QColor &color);
private:
diff --git a/src/widgets/dialogs/UserInfoPopup.cpp b/src/widgets/dialogs/UserInfoPopup.cpp
index 3c82d43f..1f5c62af 100644
--- a/src/widgets/dialogs/UserInfoPopup.cpp
+++ b/src/widgets/dialogs/UserInfoPopup.cpp
@@ -13,6 +13,7 @@
#include "providers/twitch/api/Kraken.hpp"
#include "singletons/Resources.hpp"
#include "singletons/Settings.hpp"
+#include "singletons/Theme.hpp"
#include "util/Clipboard.hpp"
#include "util/Helpers.hpp"
#include "util/LayoutCreator.hpp"
@@ -42,7 +43,7 @@ namespace {
{
auto label = box.emplace