summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-10 15:39:56 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-10 15:39:56 (GMT)
commit71d4f71c41e8bdfeaf4620a6b174a3dcb6930d23 (patch)
tree3f3868114b6c0d74400181d5d377cbaa0fe60814
parent7e79f0d7eb5285a778b5ec82b4f64b08be99b562 (diff)
parentf156be7e8010f5280d5bcba0674eab80d8fc1244 (diff)
downloadQt-71d4f71c41e8bdfeaf4620a6b174a3dcb6930d23.zip
Qt-71d4f71c41e8bdfeaf4620a6b174a3dcb6930d23.tar.gz
Qt-71d4f71c41e8bdfeaf4620a6b174a3dcb6930d23.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: QS60Style will draw focus frame to a PushButton with any stylesheeting
-rw-r--r--src/gui/styles/qs60style.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index 8bae18e..924cabc 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -2045,16 +2045,17 @@ void QS60Style::drawPrimitive(PrimitiveElement element, const QStyleOption *opti
case PE_FrameFocusRect: {
//Draw themed highlight to radiobuttons and checkboxes.
//For other widgets skip, unless palette has been modified. In that case, draw with commonstyle.
- if (option->palette.highlight().color() == QS60StylePrivate::themePalette()->highlight().color())
+ if (option->palette.highlight().color() == QS60StylePrivate::themePalette()->highlight().color()) {
if ((qstyleoption_cast<const QStyleOptionFocusRect *>(option) &&
(qobject_cast<const QRadioButton *>(widget) || qobject_cast<const QCheckBox *>(widget))))
QS60StylePrivate::drawSkinElement(
QS60StylePrivate::isWidgetPressed(widget) ?
QS60StylePrivate::SE_ListItemPressed :
QS60StylePrivate::SE_ListHighlight, painter, option->rect, flags);
- else
+ } else {
commonStyleDraws = true;
}
+ }
break;
#ifndef QT_NO_LINEEDIT
case PE_PanelLineEdit: