summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSami Merila <sami.merila@nokia.com>2010-05-10 12:00:26 (GMT)
committerSami Merila <sami.merila@nokia.com>2010-05-10 12:00:26 (GMT)
commitda45b1ce09c318acecf8a44ca08bef57a74ff1f1 (patch)
tree5ec5012e66dc8b6e2dd4a0ffc90c3ed0403a0605
parent23f3c92081a8afd6ff4be352fee407817950e72f (diff)
downloadQt-da45b1ce09c318acecf8a44ca08bef57a74ff1f1.zip
Qt-da45b1ce09c318acecf8a44ca08bef57a74ff1f1.tar.gz
Qt-da45b1ce09c318acecf8a44ca08bef57a74ff1f1.tar.bz2
QS60Style will draw focus frame to a PushButton with any stylesheeting
Due to incorrect braces in the if-within-if, QS60Style decided to use QCommonStyle for styling focus frame into QPushButton when button had *any* kind of stylesheet. Corrected the braces. Task-number: QTBUG-10549 Reviewed-by: Alessandro Portale
-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: