[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
This commit is contained in:
Binary file not shown.
|
After Width: | Height: | Size: 2.8 KiB |
@@ -10,6 +10,7 @@
|
|||||||
<file>tlds.txt</file>
|
<file>tlds.txt</file>
|
||||||
<file>avatars/fourtf.png</file>
|
<file>avatars/fourtf.png</file>
|
||||||
<file>avatars/pajlada.png</file>
|
<file>avatars/pajlada.png</file>
|
||||||
|
<file>buttons/addSplit.png</file>
|
||||||
<file>buttons/addSplitDark.png</file>
|
<file>buttons/addSplitDark.png</file>
|
||||||
<file>buttons/ban.png</file>
|
<file>buttons/ban.png</file>
|
||||||
<file>buttons/banRed.png</file>
|
<file>buttons/banRed.png</file>
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ Resources2::Resources2()
|
|||||||
{
|
{
|
||||||
this->avatars.fourtf = QPixmap(":/avatars/fourtf.png");
|
this->avatars.fourtf = QPixmap(":/avatars/fourtf.png");
|
||||||
this->avatars.pajlada = QPixmap(":/avatars/pajlada.png");
|
this->avatars.pajlada = QPixmap(":/avatars/pajlada.png");
|
||||||
|
this->buttons.addSplit = QPixmap(":/buttons/addSplit.png");
|
||||||
this->buttons.addSplitDark = QPixmap(":/buttons/addSplitDark.png");
|
this->buttons.addSplitDark = QPixmap(":/buttons/addSplitDark.png");
|
||||||
this->buttons.ban = QPixmap(":/buttons/ban.png");
|
this->buttons.ban = QPixmap(":/buttons/ban.png");
|
||||||
this->buttons.banRed = QPixmap(":/buttons/banRed.png");
|
this->buttons.banRed = QPixmap(":/buttons/banRed.png");
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ public:
|
|||||||
QPixmap pajlada;
|
QPixmap pajlada;
|
||||||
} avatars;
|
} avatars;
|
||||||
struct {
|
struct {
|
||||||
|
QPixmap addSplit;
|
||||||
QPixmap addSplitDark;
|
QPixmap addSplitDark;
|
||||||
QPixmap ban;
|
QPixmap ban;
|
||||||
QPixmap banRed;
|
QPixmap banRed;
|
||||||
|
|||||||
@@ -63,14 +63,12 @@ void Theme::actuallyUpdate(double hue, double multiplier)
|
|||||||
|
|
||||||
/// WINDOW
|
/// WINDOW
|
||||||
{
|
{
|
||||||
/*
|
|
||||||
QColor bg =
|
QColor bg =
|
||||||
#ifdef Q_OS_LINUX
|
#ifdef Q_OS_LINUX
|
||||||
this->window.background = lightWin ? "#fff" : QColor(61, 60, 56);
|
this->window.background = lightWin ? "#fff" : QColor(61, 60, 56);
|
||||||
#else
|
#else
|
||||||
this->window.background = lightWin ? "#fff" : "#111";
|
this->window.background = lightWin ? "#fff" : "#111";
|
||||||
#endif
|
#endif
|
||||||
*/
|
|
||||||
|
|
||||||
QColor fg = this->window.text = lightWin ? "#000" : "#eee";
|
QColor fg = this->window.text = lightWin ? "#000" : "#eee";
|
||||||
this->window.borderFocused = lightWin ? "#ccc" : themeColor;
|
this->window.borderFocused = lightWin ? "#ccc" : themeColor;
|
||||||
@@ -109,7 +107,7 @@ void Theme::actuallyUpdate(double hue, double multiplier)
|
|||||||
{QColor("#00aeef"), QColor("#00aeef"), QColor("#00aeef")}};
|
{QColor("#00aeef"), QColor("#00aeef"), QColor("#00aeef")}};
|
||||||
this->tabs.notified = {
|
this->tabs.notified = {
|
||||||
fg,
|
fg,
|
||||||
{QColor("#252525"), QColor("#252525"), QColor("#252525")},
|
{QColor("#fff"), QColor("#fff"), QColor("#fff")},
|
||||||
{QColor("#F824A8"), QColor("#F824A8"), QColor("#F824A8")}};
|
{QColor("#F824A8"), QColor("#F824A8"), QColor("#F824A8")}};
|
||||||
} else {
|
} else {
|
||||||
this->tabs.regular = {
|
this->tabs.regular = {
|
||||||
|
|||||||
@@ -519,9 +519,11 @@ void SplitHeader::themeChangedEvent()
|
|||||||
// --
|
// --
|
||||||
if (this->theme->isLightTheme()) {
|
if (this->theme->isLightTheme()) {
|
||||||
this->dropdownButton_->setPixmap(getApp()->resources->buttons.menuDark);
|
this->dropdownButton_->setPixmap(getApp()->resources->buttons.menuDark);
|
||||||
|
this->addButton_->setPixmap(getApp()->resources->buttons.addSplit);
|
||||||
} else {
|
} else {
|
||||||
this->dropdownButton_->setPixmap(
|
this->dropdownButton_->setPixmap(
|
||||||
getApp()->resources->buttons.menuLight);
|
getApp()->resources->buttons.menuLight);
|
||||||
|
this->addButton_->setPixmap(getApp()->resources->buttons.addSplitDark);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -139,7 +139,7 @@ void SplitInput::updateEmoteButton()
|
|||||||
text.replace("xD", QString::number(int(12 * scale)));
|
text.replace("xD", QString::number(int(12 * scale)));
|
||||||
|
|
||||||
if (this->theme->isLightTheme()) {
|
if (this->theme->isLightTheme()) {
|
||||||
text.replace("emote", "emote_dark");
|
text.replace("emote", "emoteDark");
|
||||||
}
|
}
|
||||||
|
|
||||||
this->ui_.emoteButton->getLabel().setText(text);
|
this->ui_.emoteButton->getLabel().setText(text);
|
||||||
|
|||||||
Reference in New Issue
Block a user