noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

[WIP] Fixing stuff in light/white theme (#723)

Browse source 
* 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
This commit is contained in:
apa420 2018-09-21 20:18:52 +02:00 committed by pajlada
parent a733b6975d
commit a3a7317e62
7 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
resources/buttons/addSplit.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.8 KiB

1
resources/resources_autogenerated.qrc
View file

@ -10,6 +10,7 @@
<file>tlds.txt</file>
<file>avatars/fourtf.png</file>
<file>avatars/pajlada.png</file>
<file>buttons/addSplit.png</file>
<file>buttons/addSplitDark.png</file>
<file>buttons/ban.png</file>
<file>buttons/banRed.png</file>

1
src/autogenerated/ResourcesAutogen.cpp
View file

@ -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");

1
src/autogenerated/ResourcesAutogen.hpp
View file

@ -12,6 +12,7 @@ public:
QPixmap pajlada;
} avatars;
struct {
QPixmap addSplit;
QPixmap addSplitDark;
QPixmap ban;
QPixmap banRed;

4
src/singletons/Theme.cpp
View file

@ -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 = {

2
src/widgets/splits/SplitHeader.cpp
View file

@ -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);
}
}

2
src/widgets/splits/SplitInput.cpp
View file

@ -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);