diff --git a/src/main.cpp b/src/main.cpp index 4c1659cc5..12840c861 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -96,8 +96,6 @@ void runNativeMessagingHost() _setmode(_fileno(stdout), _O_BINARY); #endif - std::ofstream xD("C:\Users\daniel\Desktop\1"); - auto &nmm = chatterino::singletons::NativeMessagingManager::getInstance(); while (true) { diff --git a/src/singletons/thememanager.cpp b/src/singletons/thememanager.cpp index 97de43f21..c15575ed0 100644 --- a/src/singletons/thememanager.cpp +++ b/src/singletons/thememanager.cpp @@ -69,7 +69,13 @@ void ThemeManager::actuallyUpdate(double hue, double multiplier) /// WINDOW { - QColor bg = this->window.background = lightWin ? "#fff" : "#444"; + QColor bg = +#ifdef Q_OS_LINUX + this->window.background = lightWin ? "#fff" : QColor(61, 60, 56); +#else + this->window.background = lightWin ? "#fff" : "#444"; +#endif + QColor fg = this->window.text = lightWin ? "#000" : "#eee"; this->window.borderFocused = lightWin ? "#ccc" : themeColor; this->window.borderUnfocused = lightWin ? "#ccc" : themeColorNoSat; diff --git a/src/widgets/basewindow.cpp b/src/widgets/basewindow.cpp index 49fdd2f32..6058a85f2 100644 --- a/src/widgets/basewindow.cpp +++ b/src/widgets/basewindow.cpp @@ -168,7 +168,6 @@ void BaseWindow::themeRefreshEvent() { if (this->enableCustomFrame) { QPalette palette; - // palette.setColor(QPalette::Background, this->themeManager.window.background); palette.setColor(QPalette::Background, QColor(0, 0, 0, 0)); palette.setColor(QPalette::Foreground, this->themeManager.window.text); this->setPalette(palette); @@ -177,6 +176,11 @@ void BaseWindow::themeRefreshEvent() button->setMouseEffectColor(this->themeManager.window.text); } } + + QPalette palette; + palette.setColor(QPalette::Background, this->themeManager.window.background); + palette.setColor(QPalette::Foreground, this->themeManager.window.text); + this->setPalette(palette); } void BaseWindow::addTitleBarButton(const TitleBarButton::Style &style, @@ -216,6 +220,8 @@ void BaseWindow::changeEvent(QEvent *) : TitleBarButton::Maximize); } #endif + + this->update(); } void BaseWindow::leaveEvent(QEvent *)