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

Flat themes: Implement Diana's separators

Browse Source 
The flat theme as defined by Diana has the motto:
"Remove unnecessary lines, avoid gradients".

This patch implemets that for the flat themes, while
leaving the default theme unchanged.

The only tweak that touches all styles is that
"Styled Separator" has for consitency now the same look
as standard toolbar separators.

Change-Id: I80ab0d9bf5ca20ab0daa57baf5a7e095a4a0c653
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
This commit is contained in:
Alessandro Portale
2016-03-02 18:25:42 +01:00
parent a6d43e317b
commit 0f8e3f2000
4 changed files with 45 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/coreplugin/fancyactionbar.cpp
View File

@@ -268,22 +268,21 @@ void FancyToolButton::paintEvent(QPaintEvent *event)
void FancyActionBar::paintEvent(QPaintEvent *event)
{
QPainter painter(this);
const QRectF borderRect = QRectF(rect()).adjusted(0.5, 0.5, -0.5, -0.5);
if (creatorTheme()->widgetStyle () == Theme::StyleFlat) {
// this paints the background of the bottom portion of the
// left tab bar
painter.fillRect(event->rect(), StyleHelper::isBaseColorDefault()
? creatorTheme()->color(Theme::FancyTabBarBackgroundColor)
: StyleHelper::baseColor());
painter.setPen(StyleHelper::separatorColor());
painter.drawLine(borderRect.topLeft(), borderRect.topRight());
} else {
painter.setPen(StyleHelper::sidebarShadow());
painter.drawLine(borderRect.topLeft(), borderRect.topRight());
painter.setPen(StyleHelper::sidebarHighlight());
painter.drawLine(borderRect.topLeft() + QPointF(1, 1), borderRect.topRight() + QPointF(0, 1));
}
QColor light = StyleHelper::sidebarHighlight();
QColor dark = StyleHelper::sidebarShadow();
const QRectF borderRect = QRectF(rect()).adjusted(0.5, 0.5, -0.5, -0.5);
painter.setPen(dark);
painter.drawLine(borderRect.topLeft(), borderRect.topRight());
painter.setPen(light);
painter.drawLine(borderRect.topLeft() + QPointF(1, 1), borderRect.topRight() + QPointF(0, 1));
}
QSize FancyToolButton::sizeHint() const