diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-16 15:23:34 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-16 15:23:34 (GMT) |
| commit | 0b9638476c1a8bad4e33cbd20be1f6ff33935766 (patch) | |
| tree | 968c6927ef9cda975f1065c41d93882231383588 /src/gui/styles/qcommonstyle.cpp | |
| parent | 8cb10f381af7fd6f1fa0ffc946f6a4e6ba106d5d (diff) | |
| parent | c9a89b253176547901e11d27c042983a65f43b1f (diff) | |
| download | Qt-0b9638476c1a8bad4e33cbd20be1f6ff33935766.zip Qt-0b9638476c1a8bad4e33cbd20be1f6ff33935766.tar.gz Qt-0b9638476c1a8bad4e33cbd20be1f6ff33935766.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6
Diffstat (limited to 'src/gui/styles/qcommonstyle.cpp')
| -rw-r--r-- | src/gui/styles/qcommonstyle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp index 4978565..039a6da 100644 --- a/src/gui/styles/qcommonstyle.cpp +++ b/src/gui/styles/qcommonstyle.cpp @@ -762,7 +762,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q #ifndef QT_NO_ITEMVIEWS case PE_PanelItemViewRow: if (const QStyleOptionViewItemV4 *vopt = qstyleoption_cast<const QStyleOptionViewItemV4 *>(opt)) { - QPalette::ColorGroup cg = vopt->state & QStyle::State_Enabled + QPalette::ColorGroup cg = (widget ? widget->isEnabled() : (vopt->state & QStyle::State_Enabled)) ? QPalette::Normal : QPalette::Disabled; if (cg == QPalette::Normal && !(vopt->state & QStyle::State_Active)) cg = QPalette::Inactive; @@ -775,7 +775,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q break; case PE_PanelItemViewItem: if (const QStyleOptionViewItemV4 *vopt = qstyleoption_cast<const QStyleOptionViewItemV4 *>(opt)) { - QPalette::ColorGroup cg = vopt->state & QStyle::State_Enabled + QPalette::ColorGroup cg = (widget ? widget->isEnabled() : (vopt->state & QStyle::State_Enabled)) ? QPalette::Normal : QPalette::Disabled; if (cg == QPalette::Normal && !(vopt->state & QStyle::State_Active)) cg = QPalette::Inactive; |