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

Fixes: Clean up manhattan toolbuttons

Browse Source 
Details:
Simplified painting a bit. Cleaner lines.
This commit is contained in:
Jens Bache-Wiig
2009-02-23 17:11:41 +01:00
parent 76af109659
commit 512c5a062d
1 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -498,24 +498,14 @@ void ManhattanStyle::drawPrimitive(PrimitiveElement element, const QStyleOption
QColor shadow(0, 0, 0, 30); QColor shadow(0, 0, 0, 30);
painter->setPen(shadow); painter->setPen(shadow);
if (pressed) { if (pressed) {
QColor shade(0, 0, 0, 50); QColor shade(0, 0, 0, 40);
if (option->state & State_Sunken) painter->fillRect(rect, shade);
shade = QColor(0, 0, 0, 50); painter->drawLine(rect.topLeft() + QPoint(1, 0), rect.topRight() - QPoint(1, 0));
#ifndef Q_WS_MAC
else if (option->state & State_MouseOver)
shade = QColor(255, 255, 255, 12);
#endif
else if (option->state & State_On)
shade = QColor(0, 0, 0, 50);
else
shade = QColor(0, 0, 0, 0);
painter->fillRect(rect.adjusted(1, 1, -1, -1), shade);
painter->drawLine(rect.topLeft(), rect.topRight());
painter->drawLine(rect.topLeft(), rect.bottomLeft()); painter->drawLine(rect.topLeft(), rect.bottomLeft());
painter->drawLine(rect.topRight(), rect.bottomRight());
// painter->drawLine(rect.bottomLeft() + QPoint(1, 0), rect.bottomRight() - QPoint(1, 0));
QColor highlight(255, 255, 255, 30); QColor highlight(255, 255, 255, 30);
painter->setPen(highlight); painter->setPen(highlight);
painter->drawLine(rect.topRight(), rect.bottomRight());
painter->drawLine(rect.bottomLeft(), rect.bottomRight());
} }
else if (option->state & State_Enabled && else if (option->state & State_Enabled &&
option->state & State_MouseOver) { option->state & State_MouseOver) {
@@ -1020,7 +1010,7 @@ void ManhattanStyle::drawComplexControl(ComplexControl control, const QStyleOpti
grad.setColorAt(1, QColor(255, 255, 255, 40)); grad.setColorAt(1, QColor(255, 255, 255, 40));
painter->setPen(QPen(grad, 0)); painter->setPen(QPen(grad, 0));
painter->drawLine(rect.topRight(), rect.bottomRight()); painter->drawLine(rect.topRight(), rect.bottomRight());
grad.setColorAt(0, QColor(0, 0, 0, 20)); grad.setColorAt(0, QColor(0, 0, 0, 30));
grad.setColorAt(0.4, QColor(0, 0, 0, 70)); grad.setColorAt(0.4, QColor(0, 0, 0, 70));
grad.setColorAt(0.7, QColor(0, 0, 0, 70)); grad.setColorAt(0.7, QColor(0, 0, 0, 70));
grad.setColorAt(1, QColor(0, 0, 0, 40)); grad.setColorAt(1, QColor(0, 0, 0, 40));
@@ -1030,11 +1020,12 @@ void ManhattanStyle::drawComplexControl(ComplexControl control, const QStyleOpti
else else
painter->drawLine(rect.topLeft(), rect.bottomLeft()); painter->drawLine(rect.topLeft(), rect.bottomLeft());
QStyleOption toolbutton = *option; QStyleOption toolbutton = *option;
toolbutton.rect.adjust(0, 0, -2, 0);
if (isEmpty) if (isEmpty)
toolbutton.state &= ~(State_Enabled | State_Sunken); toolbutton.state &= ~(State_Enabled | State_Sunken);
painter->save();
painter->setClipRect(toolbutton.rect.adjusted(0, 0, -2, 0));
drawPrimitive(PE_PanelButtonTool, &toolbutton, painter, widget); drawPrimitive(PE_PanelButtonTool, &toolbutton, painter, widget);
painter->restore();
// Draw arrow // Draw arrow
int menuButtonWidth = 12; int menuButtonWidth = 12;
int left = !reverse ? rect.right() - menuButtonWidth : rect.left(); int left = !reverse ? rect.right() - menuButtonWidth : rect.left();