1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QWindows11Style: Add offset for decoration in QComboBoxPrivateContainer

Browse Source 
Pick-to: 6.7.0
Change-Id: Ib9043e1b3041c88d757ddd5ada6c0edcf2bb6129
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 587003c3ccf6f8abab9aa6e8131f5ff6ce368d8a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Wladimir Leuschner 2024-03-19 16:46:43 +01:00 committed by Qt Cherry-pick Bot
parent 39e8c72c67
commit 382505e22f
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/styles/modernwindows/qwindows11style.cpp
View File

@ -1713,11 +1713,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);