From 2dea2265ef6bbbeba9f53b695f7d8942770adc60 Mon Sep 17 00:00:00 2001 From: fourtf Date: Sat, 5 Aug 2017 17:01:02 +0200 Subject: [PATCH] fixed notebook button colors --- src/widgets/fancybutton.hpp | 7 ++++--- src/widgets/notebookbutton.cpp | 17 +++++++++-------- src/widgets/notebookbutton.hpp | 2 -- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/widgets/fancybutton.hpp b/src/widgets/fancybutton.hpp index 3fd154eb..172c13b1 100644 --- a/src/widgets/fancybutton.hpp +++ b/src/widgets/fancybutton.hpp @@ -29,6 +29,10 @@ public: void setMouseEffectColor(QColor color); protected: + bool selected = false; + bool mouseOver = false; + bool mouseDown = false; + virtual void paintEvent(QPaintEvent *) override; virtual void enterEvent(QEvent *) override; virtual void leaveEvent(QEvent *) override; @@ -39,9 +43,6 @@ protected: void fancyPaint(QPainter &painter); private: - bool selected = false; - bool mouseOver = false; - bool mouseDown = false; QPoint mousePos; double hoverMultiplier = 0.0; QTimer effectTimer; diff --git a/src/widgets/notebookbutton.cpp b/src/widgets/notebookbutton.cpp index 896559e2..a485d003 100644 --- a/src/widgets/notebookbutton.cpp +++ b/src/widgets/notebookbutton.cpp @@ -23,16 +23,17 @@ void NotebookButton::paintEvent(QPaintEvent *) QColor background; QColor foreground; - if (mouseDown) { - background = this->colorScheme.TabSelectedBackground; - foreground = this->colorScheme.TabSelectedText; + background = this->colorScheme.TabPanelBackground; + + if (mouseDown) { + //background = this->colorScheme.TabSelectedBackground; + foreground = this->colorScheme.TabHoverText; } else if (mouseOver) { - background = this->colorScheme.TabHoverBackground; - foreground = this->colorScheme.TabSelectedBackground; + //background = this->colorScheme.TabHoverText; + foreground = this->colorScheme.TabHoverText; } else { - background = this->colorScheme.TabPanelBackground; - // foreground = this->colorScheme.TabSelectedBackground; - foreground = QColor(230, 230, 230); + //background = this->colorScheme.TabPanelBackground; + foreground = QColor(70, 80, 80); } painter.setPen(Qt::NoPen); diff --git a/src/widgets/notebookbutton.hpp b/src/widgets/notebookbutton.hpp index 438b27df..a571421e 100644 --- a/src/widgets/notebookbutton.hpp +++ b/src/widgets/notebookbutton.hpp @@ -28,8 +28,6 @@ signals: void clicked(); private: - bool mouseOver = false; - bool mouseDown = false; QPoint mousePos; };