noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

tabs now grey out when the window loses focus

Browse source
This commit is contained in:
fourtf 2017-08-17 16:43:19 +02:00
parent b8db0f7d4c
commit 6b0a7f507e
4 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/colorscheme.cpp
View file

@ -90,6 +90,9 @@ void ColorScheme::setColors(double hue, double multiplier)
TabSelectedText = QColor(255, 255, 255); TabSelectedText = QColor(255, 255, 255);
TabSelectedBackground = getColor(hue, 0.5, 0.5); TabSelectedBackground = getColor(hue, 0.5, 0.5);
TabSelectedUnfocusedText = QColor(255, 255, 255);
TabSelectedUnfocusedBackground = getColor(hue, 0, 0.5);
TabHighlightedText = QColor(0, 0, 0); TabHighlightedText = QColor(0, 0, 0);
TabHighlightedBackground = getColor(hue, 0.5, 0.2); TabHighlightedBackground = getColor(hue, 0.5, 0.2);

3
src/colorscheme.hpp
View file

@ -68,6 +68,9 @@ public:
QColor TabHighlightedText; QColor TabHighlightedText;
QColor TabHighlightedBackground; QColor TabHighlightedBackground;
QColor TabSelectedUnfocusedText;
QColor TabSelectedUnfocusedBackground;
QBrush TabNewMessageBackground; QBrush TabNewMessageBackground;
const int HighlightColorCount = 3; const int HighlightColorCount = 3;

11
src/widgets/notebookpage.cpp
View file

@ -4,6 +4,7 @@
#include "widgets/notebook.hpp" #include "widgets/notebook.hpp"
#include "widgets/notebooktab.hpp" #include "widgets/notebooktab.hpp"
#include <QApplication>
#include <QDebug> #include <QDebug>
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QMimeData> #include <QMimeData>
@ -364,15 +365,17 @@ void NotebookPage::paintEvent(QPaintEvent *)
if (this->ui.hbox.count() == 0) { if (this->ui.hbox.count() == 0) {
painter.fillRect(rect(), this->colorScheme.ChatBackground); painter.fillRect(rect(), this->colorScheme.ChatBackground);
painter.fillRect(0, 0, width(), 2, this->colorScheme.TabSelectedBackground);
painter.setPen(this->colorScheme.Text); painter.setPen(this->colorScheme.Text);
painter.drawText(rect(), "Add Chat", QTextOption(Qt::AlignCenter)); painter.drawText(rect(), "Add Chat", QTextOption(Qt::AlignCenter));
} else { } else {
painter.fillRect(rect(), this->colorScheme.ChatSeperator); painter.fillRect(rect(), this->colorScheme.ChatSeperator);
painter.fillRect(0, 0, width(), 2, this->colorScheme.TabSelectedBackground);
} }
QColor accentColor = (QApplication::activeWindow() == this->window()
? this->colorScheme.TabSelectedBackground
: this->colorScheme.TabSelectedUnfocusedBackground);
painter.fillRect(0, 0, width(), 2, accentColor);
} }
void NotebookPage::showEvent(QShowEvent *event) void NotebookPage::showEvent(QShowEvent *event)

10
src/widgets/notebooktab.cpp
View file

@ -6,6 +6,7 @@
#include <QDebug> #include <QDebug>
#include <QPainter> #include <QPainter>
#include <QApplication>
namespace chatterino { namespace chatterino {
namespace widgets { namespace widgets {
@ -154,8 +155,13 @@ void NotebookTab::paintEvent(QPaintEvent *)
QColor fg = QColor(0, 0, 0); QColor fg = QColor(0, 0, 0);
if (this->selected) { if (this->selected) {
painter.fillRect(rect(), this->colorScheme.TabSelectedBackground); if (this->window() == QApplication::activeWindow()) {
fg = this->colorScheme.TabSelectedText; painter.fillRect(rect(), this->colorScheme.TabSelectedBackground);
fg = this->colorScheme.TabSelectedText;
} else {
painter.fillRect(rect(), this->colorScheme.TabSelectedUnfocusedBackground);
fg = this->colorScheme.TabSelectedUnfocusedText;
}
} else if (this->mouseOver) { } else if (this->mouseOver) {
painter.fillRect(rect(), this->colorScheme.TabHoverBackground); painter.fillRect(rect(), this->colorScheme.TabHoverBackground);
fg = this->colorScheme.TabHoverText; fg = this->colorScheme.TabHoverText;