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

Flat themes: remove the shadow from pressed manhattan toolbuttons

Browse Source 
That's flatter and more consistent with the flat pressed buttons in the
mode bar and status bar.

Change-Id: I29edd2b184b8468005bffe8fe8c9f2e275355df1
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
This commit is contained in:
Alessandro Portale
2016-04-02 20:24:00 +02:00
parent 14af79932a
commit 3e1c7f6fd5
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -485,15 +485,16 @@ void ManhattanStyle::drawPrimitive(PrimitiveElement element, const QStyleOption
anim->paint(painter, option); anim->paint(painter, option);
} else { } else {
bool pressed = option->state & State_Sunken || option->state & State_On; bool pressed = option->state & State_Sunken || option->state & State_On;
QColor shadow(0, 0, 0, 30); painter->setPen(StyleHelper::sidebarShadow());
painter->setPen(shadow);
if (pressed) { if (pressed) {
const QColor shade = creatorTheme()->color(Theme::FancyToolButtonSelectedColor); const QColor shade = creatorTheme()->color(Theme::FancyToolButtonSelectedColor);
painter->fillRect(rect, shade); painter->fillRect(rect, shade);
if (creatorTheme()->widgetStyle() == Theme::StyleDefault) {
const QRectF borderRect = QRectF(rect).adjusted(0.5, 0.5, -0.5, -0.5); const QRectF borderRect = QRectF(rect).adjusted(0.5, 0.5, -0.5, -0.5);
painter->drawLine(borderRect.topLeft() + QPointF(1, 0), borderRect.topRight() - QPointF(1, 0)); painter->drawLine(borderRect.topLeft() + QPointF(1, 0), borderRect.topRight() - QPointF(1, 0));
painter->drawLine(borderRect.topLeft(), borderRect.bottomLeft()); painter->drawLine(borderRect.topLeft(), borderRect.bottomLeft());
painter->drawLine(borderRect.topRight(), borderRect.bottomRight()); painter->drawLine(borderRect.topRight(), borderRect.bottomRight());
}
} else if (option->state & State_Enabled && option->state & State_MouseOver) { } else if (option->state & State_Enabled && option->state & State_MouseOver) {
painter->fillRect(rect, creatorTheme()->color(Theme::FancyToolButtonHoverColor)); painter->fillRect(rect, creatorTheme()->color(Theme::FancyToolButtonHoverColor));
} else if (widget && widget->property("highlightWidget").toBool()) { } else if (widget && widget->property("highlightWidget").toBool()) {