feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

MiniSplitter: Make it actually themable via SplitterColor

Browse Source 
The CE_Splitter drawControl code in ManhattanStyle wasn't used. This
patch removes it, changes MiniPliter::onPaint to use the theme color,
and adjusts dark.creatortheme's SplitterColor so that actually nothing
changes visually.

Change-Id: I0b94bd2125fd037c2c21dad195f31d092332db43
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
This commit is contained in:
Alessandro Portale
2015-12-08 11:17:35 +01:00
parent 957c0af570
commit b327f1a78c
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/themes/dark.creatortheme
View File

@@ -92,7 +92,7 @@ ProgressBarColorError=error
ProgressBarColorFinished=ff5aaa3c ProgressBarColorFinished=ff5aaa3c
ProgressBarColorNormal=hoverBackground ProgressBarColorNormal=hoverBackground
ProgressBarTitleColor=text ProgressBarTitleColor=text
SplitterColor=ffb0b0b0 SplitterColor=ff313131
TextColorDisabled=textDisabled TextColorDisabled=textDisabled
TextColorError=ffff4040 TextColorError=ffff4040
TextColorHighlight=ffff0000 TextColorHighlight=ffff0000

7
src/plugins/coreplugin/manhattanstyle.cpp
View File

@@ -622,13 +622,6 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt
return QProxyStyle::drawControl(element, option, painter, widget); return QProxyStyle::drawControl(element, option, painter, widget);
switch (element) { switch (element) {
case CE_Splitter:
if (creatorTheme()->widgetStyle() == Theme::StyleFlat)
painter->fillRect(option->rect, creatorTheme()->color(Theme::SplitterColor));
else
painter->fillRect(option->rect, StyleHelper::borderColor());
break;
case CE_TabBarTabShape: case CE_TabBarTabShape:
// Most styles draw a single dark outline. This looks rather ugly when combined with our // Most styles draw a single dark outline. This looks rather ugly when combined with our
// single pixel dark separator so we adjust the first tab to compensate for this // single pixel dark separator so we adjust the first tab to compensate for this

6
src/plugins/coreplugin/minisplitter.cpp
View File

@@ -31,6 +31,7 @@
#include "minisplitter.h" #include "minisplitter.h"
#include <utils/stylehelper.h> #include <utils/stylehelper.h>
#include <utils/theme/theme.h>
#include <QPaintEvent> #include <QPaintEvent>
#include <QPainter> #include <QPainter>
@@ -76,7 +77,10 @@ void MiniSplitterHandle::resizeEvent(QResizeEvent *event)
void MiniSplitterHandle::paintEvent(QPaintEvent *event) void MiniSplitterHandle::paintEvent(QPaintEvent *event)
{ {
QPainter painter(this); QPainter painter(this);
painter.fillRect(event->rect(), Utils::StyleHelper::borderColor(m_lightColored)); const QColor color = m_lightColored
? Utils::StyleHelper::borderColor(m_lightColored)
: Utils::creatorTheme()->color(Utils::Theme::SplitterColor);
painter.fillRect(event->rect(), color);
} }
QSplitterHandle *MiniSplitter::createHandle() QSplitterHandle *MiniSplitter::createHandle()