From a3a7317e624cdeb9c8e9f1aa906779a868866ce3 Mon Sep 17 00:00:00 2001 From: apa420 <17131426+apa420@users.noreply.github.com> Date: Fri, 21 Sep 2018 20:18:52 +0200 Subject: [PATCH] [WIP] Fixing stuff in light/white theme (#723) * fixed color in light/white them when a tab lights pink * fixes background color of chatterino in white/light-themes * Fixed emoji-button in light/white-theme * added light/white-theme addsplit-button * forgot to add the image-file --- resources/buttons/addSplit.png | Bin 0 -> 2852 bytes resources/resources_autogenerated.qrc | 1 + src/autogenerated/ResourcesAutogen.cpp | 1 + src/autogenerated/ResourcesAutogen.hpp | 1 + src/singletons/Theme.cpp | 4 +--- src/widgets/splits/SplitHeader.cpp | 2 ++ src/widgets/splits/SplitInput.cpp | 2 +- 7 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 resources/buttons/addSplit.png diff --git a/resources/buttons/addSplit.png b/resources/buttons/addSplit.png new file mode 100644 index 0000000000000000000000000000000000000000..54714d573ed0b3f484fb4e2c12a95a6003ab092b GIT binary patch literal 2852 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.txt avatars/fourtf.png avatars/pajlada.png + buttons/addSplit.png buttons/addSplitDark.png buttons/ban.png buttons/banRed.png diff --git a/src/autogenerated/ResourcesAutogen.cpp b/src/autogenerated/ResourcesAutogen.cpp index 9d67608e8..ee25daf1f 100644 --- a/src/autogenerated/ResourcesAutogen.cpp +++ b/src/autogenerated/ResourcesAutogen.cpp @@ -6,6 +6,7 @@ Resources2::Resources2() { this->avatars.fourtf = QPixmap(":/avatars/fourtf.png"); this->avatars.pajlada = QPixmap(":/avatars/pajlada.png"); + this->buttons.addSplit = QPixmap(":/buttons/addSplit.png"); this->buttons.addSplitDark = QPixmap(":/buttons/addSplitDark.png"); this->buttons.ban = QPixmap(":/buttons/ban.png"); this->buttons.banRed = QPixmap(":/buttons/banRed.png"); diff --git a/src/autogenerated/ResourcesAutogen.hpp b/src/autogenerated/ResourcesAutogen.hpp index 4a6f9fc4b..c7af30fc1 100644 --- a/src/autogenerated/ResourcesAutogen.hpp +++ b/src/autogenerated/ResourcesAutogen.hpp @@ -12,6 +12,7 @@ public: QPixmap pajlada; } avatars; struct { + QPixmap addSplit; QPixmap addSplitDark; QPixmap ban; QPixmap banRed; diff --git a/src/singletons/Theme.cpp b/src/singletons/Theme.cpp index ae0e26d5f..cae5da1e2 100644 --- a/src/singletons/Theme.cpp +++ b/src/singletons/Theme.cpp @@ -63,14 +63,12 @@ void Theme::actuallyUpdate(double hue, double multiplier) /// WINDOW { - /* QColor bg = #ifdef Q_OS_LINUX this->window.background = lightWin ? "#fff" : QColor(61, 60, 56); #else this->window.background = lightWin ? "#fff" : "#111"; #endif - */ QColor fg = this->window.text = lightWin ? "#000" : "#eee"; this->window.borderFocused = lightWin ? "#ccc" : themeColor; @@ -109,7 +107,7 @@ void Theme::actuallyUpdate(double hue, double multiplier) {QColor("#00aeef"), QColor("#00aeef"), QColor("#00aeef")}}; this->tabs.notified = { fg, - {QColor("#252525"), QColor("#252525"), QColor("#252525")}, + {QColor("#fff"), QColor("#fff"), QColor("#fff")}, {QColor("#F824A8"), QColor("#F824A8"), QColor("#F824A8")}}; } else { this->tabs.regular = { diff --git a/src/widgets/splits/SplitHeader.cpp b/src/widgets/splits/SplitHeader.cpp index 61edee4df..5a883eee8 100644 --- a/src/widgets/splits/SplitHeader.cpp +++ b/src/widgets/splits/SplitHeader.cpp @@ -519,9 +519,11 @@ void SplitHeader::themeChangedEvent() // -- if (this->theme->isLightTheme()) { this->dropdownButton_->setPixmap(getApp()->resources->buttons.menuDark); + this->addButton_->setPixmap(getApp()->resources->buttons.addSplit); } else { this->dropdownButton_->setPixmap( getApp()->resources->buttons.menuLight); + this->addButton_->setPixmap(getApp()->resources->buttons.addSplitDark); } } diff --git a/src/widgets/splits/SplitInput.cpp b/src/widgets/splits/SplitInput.cpp index 9401052f2..a25a28563 100644 --- a/src/widgets/splits/SplitInput.cpp +++ b/src/widgets/splits/SplitInput.cpp @@ -139,7 +139,7 @@ void SplitInput::updateEmoteButton() text.replace("xD", QString::number(int(12 * scale))); if (this->theme->isLightTheme()) { - text.replace("emote", "emote_dark"); + text.replace("emote", "emoteDark"); } this->ui_.emoteButton->getLabel().setText(text);