summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/plugins/styles/modernwindows/qwindows11style.cpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/plugins/styles/modernwindows/qwindows11style.cpp b/src/plugins/styles/modernwindows/qwindows11style.cpp
index 1016316f28..08886eaa93 100644
--- a/src/plugins/styles/modernwindows/qwindows11style.cpp
+++ b/src/plugins/styles/modernwindows/qwindows11style.cpp
@@ -1703,11 +1703,17 @@ QRect QWindows11Style::subElementRect(QStyle::SubElement element, const QStyleOp
ret = option->rect.adjusted(8,0,-8,0);
break;
case QStyle::SE_ItemViewItemText:
- if (widget && widget->parentWidget() &&
- widget->parentWidget()->inherits("QComboBoxPrivateContainer"))
- ret = option->rect.adjusted(5,0,-5,0);
- else
+ if (const auto *item = qstyleoption_cast<const QStyleOptionViewItem *>(option)) {
+ const int decorationOffset = item->features.testFlag(QStyleOptionViewItem::HasDecoration) ? item->decorationSize.width() : 0;
+ if (widget && widget->parentWidget() &&
+ widget->parentWidget()->inherits("QComboBoxPrivateContainer")) {
+ ret = option->rect.adjusted(decorationOffset + 5, 0, -5, 0);
+ } else {
+ ret = QWindowsVistaStyle::subElementRect(element, option, widget);
+ }
+ } else {
ret = QWindowsVistaStyle::subElementRect(element, option, widget);
+ }
break;
default:
ret = QWindowsVistaStyle::subElementRect(element, option, widget);