chatterino2
Code Issues

added dark window to dark theme

Browse Source
This commit is contained in:
fourtf
2018-04-05 23:44:46 +02:00
parent 5c23be2122
commit 06c3201a1a
8 changed files with 88 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/basewindow.cpp
+18 -11
View File
@@ -160,12 +160,12 @@ void BaseWindow::themeRefreshEvent()
{
if (this->enableCustomFrame) {
QPalette palette;
palette.setColor(QPalette::Background, this->themeManager.windowBg);
palette.setColor(QPalette::Foreground, this->themeManager.windowText);
palette.setColor(QPalette::Background, this->themeManager.window.background);
palette.setColor(QPalette::Foreground, this->themeManager.window.text);
this->setPalette(palette);
for (RippleEffectButton *button : this->buttons) {
button->setMouseEffectColor(this->themeManager.windowText);
button->setMouseEffectColor(this->themeManager.window.text);
}
}
}
@@ -408,15 +408,22 @@ void BaseWindow::paintEvent(QPaintEvent *event)
bool windowFocused = this->window() == QApplication::activeWindow();
QLinearGradient gradient(0, 0, 10, 250);
gradient.setColorAt(1, this->themeManager.tabs.selected.backgrounds.unfocused.color());
// QLinearGradient gradient(0, 0, 10, 250);
// gradient.setColorAt(1,
// this->themeManager.tabs.selected.backgrounds.unfocused.color());
if (windowFocused) {
gradient.setColorAt(.4, this->themeManager.tabs.selected.backgrounds.regular.color());
} else {
gradient.setColorAt(.4, this->themeManager.tabs.selected.backgrounds.unfocused.color());
}
painter.setPen(QPen(QBrush(gradient), 1));
// if (windowFocused) {
// gradient.setColorAt(.4,
// this->themeManager.tabs.selected.backgrounds.regular.color());
// } else {
// gradient.setColorAt(.4,
// this->themeManager.tabs.selected.backgrounds.unfocused.color());
// }
// painter.setPen(QPen(QBrush(gradient), 1));
QColor &border = windowFocused ? this->themeManager.window.borderFocused
: this->themeManager.window.borderUnfocused;
painter.setPen(QPen(QBrush(border), 1));
painter.drawRect(0, 0, this->width() - 1, this->height() - 1);
}
src/widgets/helper/notebookbutton.cpp
+7 -5
View File
@@ -17,11 +17,14 @@ namespace widgets {
NotebookButton::NotebookButton(BaseWidget *parent)
: RippleEffectButton(parent)
{
setMouseEffectColor(QColor(0, 0, 0));
this->setAcceptDrops(true);
}
void NotebookButton::themeRefreshEvent()
{
this->setMouseEffectColor(this->themeManager.tabs.regular.text);
}
void NotebookButton::paintEvent(QPaintEvent *)
{
QPainter painter(this);
@@ -30,15 +33,14 @@ void NotebookButton::paintEvent(QPaintEvent *)
QColor foreground;
if (mouseDown || mouseOver) {
background = this->themeManager.tabs.regular.backgrounds.regular.color();
background = this->themeManager.tabs.regular.backgrounds.hover.color();
foreground = this->themeManager.tabs.regular.text;
} else {
background = this->themeManager.tabs.regular.backgrounds.regular.color();
foreground = QColor(70, 80, 80);
foreground = this->themeManager.tabs.regular.text;
}
painter.setPen(Qt::NoPen);
// painter.fillRect(this->rect(), background);
float h = height(), w = width();
src/widgets/helper/notebookbutton.hpp
+1
View File
@@ -21,6 +21,7 @@ public:
NotebookButton(BaseWidget *parent);
protected:
virtual void themeRefreshEvent() override;
virtual void paintEvent(QPaintEvent *) override;
virtual void mouseReleaseEvent(QMouseEvent *) override;
virtual void dragEnterEvent(QDragEnterEvent *) override;
src/widgets/helper/notebooktab.cpp
+7 -7
View File
@@ -209,13 +209,13 @@ void NotebookTab::paintEvent(QPaintEvent *)
painter.fillRect(rect(), tabBackground);
// draw border
painter.setPen(QPen("#ccc"));
QPainterPath path(QPointF(0, height));
path.lineTo(0, 0);
path.lineTo(this->width() - 1, 0);
path.lineTo(this->width() - 1, this->height() - 1);
path.lineTo(0, this->height() - 1);
painter.drawPath(path);
// painter.setPen(QPen("#ccc"));
// QPainterPath path(QPointF(0, height));
// path.lineTo(0, 0);
// path.lineTo(this->width() - 1, 0);
// path.lineTo(this->width() - 1, this->height() - 1);
// path.lineTo(0, this->height() - 1);
// painter.drawPath(path);
} else {
// QPainterPath path(QPointF(0, height));
// path.lineTo(8 * scale, 0);
src/widgets/helper/titlebarbutton.cpp
+8 -4
View File
@@ -1,5 +1,7 @@
#include "titlebarbutton.hpp"
#include "singletons/thememanager.hpp"
namespace chatterino {
namespace widgets {
@@ -23,8 +25,8 @@ void TitleBarButton::paintEvent(QPaintEvent *)
{
QPainter painter(this);
QColor color = "#000";
QColor background = "#fff";
QColor color = this->themeManager.window.text;
QColor background = this->themeManager.window.background;
int xD = this->height() / 3;
int centerX = this->width() / 2;
@@ -59,7 +61,8 @@ void TitleBarButton::paintEvent(QPaintEvent *)
break;
}
case User: {
color = QColor("#333");
// color = QColor("#333");
color = "#999";
painter.setRenderHint(QPainter::Antialiasing);
painter.setRenderHint(QPainter::HighQualityAntialiasing);
@@ -85,7 +88,8 @@ void TitleBarButton::paintEvent(QPaintEvent *)
break;
}
case Settings: {
color = QColor("#333");
// color = QColor("#333");
color = "#999";
painter.setRenderHint(QPainter::Antialiasing);
painter.setRenderHint(QPainter::HighQualityAntialiasing);
src/widgets/splitcontainer.cpp
+1 -1
View File
@@ -414,7 +414,7 @@ void SplitContainer::paintEvent(QPaintEvent *)
? this->themeManager.tabs.selected.backgrounds.regular
: this->themeManager.tabs.selected.backgrounds.unfocused);
painter.fillRect(0, 0, width(), 2, accentColor);
painter.fillRect(0, 0, width(), 1, accentColor);
}
void SplitContainer::showEvent(QShowEvent *event)