diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-03 08:08:26 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-03 08:08:26 (GMT) |
| commit | e3fcbf32285fe5033260affc3088deaa6fad6fc7 (patch) | |
| tree | 1b9617ce375fafefa3b709d751d264bf0a239454 /src/gui/styles/qcommonstyle.cpp | |
| parent | 3782dc6d92210e9ae5fb7ee27cc7cd78dee79ebf (diff) | |
| parent | 43482fcfc106864f104f463002575c389d40b12f (diff) | |
| download | Qt-e3fcbf32285fe5033260affc3088deaa6fad6fc7.zip Qt-e3fcbf32285fe5033260affc3088deaa6fad6fc7.tar.gz Qt-e3fcbf32285fe5033260affc3088deaa6fad6fc7.tar.bz2 | |
Merge earth-team into origin/4.8
Conflicts:
configure
Diffstat (limited to 'src/gui/styles/qcommonstyle.cpp')
| -rw-r--r-- | src/gui/styles/qcommonstyle.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp index 7944a0b..2534d3e 100644 --- a/src/gui/styles/qcommonstyle.cpp +++ b/src/gui/styles/qcommonstyle.cpp @@ -223,16 +223,13 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q --yy; } if (!(opt->state & State_Enabled) && !(opt->state & State_On)) { - int pnt; - p->setPen(opt->palette.highlightedText().color()); - QPoint offset(1, 1); - for (pnt = 0; pnt < a.size(); ++pnt) - a[pnt].translate(offset.x(), offset.y()); + p->save(); + p->translate(1, 1); + p->setPen(opt->palette.light().color()); p->drawLines(a); - for (pnt = 0; pnt < a.size(); ++pnt) - a[pnt].translate(offset.x(), offset.y()); + p->restore(); } - p->setPen(opt->palette.text().color()); + p->setPen((opt->state & State_On) ? opt->palette.highlightedText().color() : opt->palette.text().color()); p->drawLines(a); break; } case PE_Frame: |