diff options
Diffstat (limited to 'src/widgets/styles/qfusionstyle.cpp')
| -rw-r--r-- | src/widgets/styles/qfusionstyle.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp index cf2f3ea26b..6ae0bde20a 100644 --- a/src/widgets/styles/qfusionstyle.cpp +++ b/src/widgets/styles/qfusionstyle.cpp @@ -1213,9 +1213,7 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio if (verticalTitleBar) { QRect rect = dwOpt->rect; QRect r = rect; - QSize s = r.size(); - s.transpose(); - r.setSize(s); + r.setSize(r.size().transposed()); titleRect = QRect(r.left() + rect.bottom() - titleRect.bottom(), r.top() + titleRect.left() - rect.left(), @@ -1544,7 +1542,8 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio bool ignoreCheckMark = false; int checkcol = qMax(menuItem->maxIconWidth, 20); - if (qobject_cast<const QComboBox*>(widget)) + if (qobject_cast<const QComboBox*>(widget) || + (option->styleObject && option->styleObject->property("_q_isComboBoxPopupItem").toBool())) ignoreCheckMark = true; //ignore the checkmarks provided by the QComboMenuDelegate if (!ignoreCheckMark) { @@ -1613,7 +1612,7 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio QRect pmr(0, 0, pixw, pixh); pmr.moveCenter(vCheckRect.center()); painter->setPen(menuItem->palette.text().color()); - if (checkable && checked) { + if (!ignoreCheckMark && checkable && checked) { QStyleOption opt = *option; if (act) { QColor activeColor = mergedColors(option->palette.background().color(), |