diff --git a/resources/buttons/addSplit.png b/resources/buttons/addSplit.png new file mode 100644 index 00000000..54714d57 Binary files /dev/null and b/resources/buttons/addSplit.png differ diff --git a/resources/resources_autogenerated.qrc b/resources/resources_autogenerated.qrc index d764d54c..9db78ea0 100644 --- a/resources/resources_autogenerated.qrc +++ b/resources/resources_autogenerated.qrc @@ -10,6 +10,7 @@ tlds.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 9d67608e..ee25daf1 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 4a6f9fc4..c7af30fc 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 ae0e26d5..cae5da1e 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 61edee4d..5a883eee 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 9401052f..a25a2856 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);