diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-12 18:03:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-12 18:03:55 (GMT) |
| commit | bc992fd8381697f57c6abb13b5fa17167d98867a (patch) | |
| tree | 3097634913b46ae0cdd2603e8650d95d489bfea4 /src/gui/styles | |
| parent | fbdde19e169975693bd179f3e493f0b588ed39f4 (diff) | |
| parent | df819cfe17f6dfd089096063524932fc4975804f (diff) | |
| download | Qt-bc992fd8381697f57c6abb13b5fa17167d98867a.zip Qt-bc992fd8381697f57c6abb13b5fa17167d98867a.tar.gz Qt-bc992fd8381697f57c6abb13b5fa17167d98867a.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fixed wrong QGroupBox check state
Added base 10 to be used with QIntValidator.
Mac: Fix the color of check marks in menus with stylesheet
Russian translation update
Don't directly access QList contents
Fix QPlainTextEdit when using Qt::TextSelectableByKeyboard flag
Diffstat (limited to 'src/gui/styles')
| -rw-r--r-- | src/gui/styles/qmacstyle_mac.mm | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm index 1c1713c..8f0e602 100644 --- a/src/gui/styles/qmacstyle_mac.mm +++ b/src/gui/styles/qmacstyle_mac.mm @@ -2920,10 +2920,14 @@ void QMacStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPai QVector<QLineF> a(2); a << QLineF(x1, y1, x2, y2); a << QLineF(x2, y2, x3, y3); - if (opt->palette.currentColorGroup() == QPalette::Active) - p->setPen(QPen(Qt::white, 3)); - else + if (opt->palette.currentColorGroup() == QPalette::Active) { + if (opt->state & State_On) + p->setPen(QPen(opt->palette.highlightedText().color(), 3)); + else + p->setPen(QPen(opt->palette.text().color(), 3)); + } else { p->setPen(QPen(QColor(100, 100, 100), 3)); + } p->save(); p->setRenderHint(QPainter::Antialiasing); p->drawLines(a); |