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

QStyleSheetStyle: fix drawing CE_MenuItem with icons

Browse Source 
Drawing a CE_MenuItem with icons when some entries don't have an icon
resulted in a misalignment of the text for the entries without an icon.
Fix it by honoring QStyleOptionMenuItem::maxIconWidth which is set by
QMenu depending on whether on if it's entries has an icon or not.

Fixes: QTBUG-130704
Task-number: QTBUG-127536
Change-Id: I826cdce5ead5da0d1e5fdd8a5e2a6972306457b2
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
(cherry picked from commit 44634c58ceb79a63102592ec4e1b8a7399a8a660)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Christian Ehrlicher 2024-10-31 17:59:50 +01:00 committed by Qt Cherry-pick Bot
parent 92005e34e8
commit 905dfd3915
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/widgets/styles/qstylesheetstyle.cpp
View File

@ -3928,10 +3928,9 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q
if (qobject_cast<const QComboBox *>(w))
drawCheckMark = false; // ignore the checkmarks provided by the QComboMenuDelegate
#endif
int textRectOffset = 0;
int textRectOffset = m->maxIconWidth;
if (!mi.icon.isNull()) {
renderMenuItemIcon(&mi, p, w, opt->rect, subRule);
textRectOffset = m->maxIconWidth;
} else if (drawCheckMark) {
const bool checkable = mi.checkType != QStyleOptionMenuItem::NotCheckable;
const bool checked = checkable ? mi.checked : false;