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

Windows11Style: Fix MenuItem drawing

Browse Source 
The drawing for CE_MenuItem had some issues:
 - it did not work in rtl mode
 - it removed 10px on the right to hide issues with e.g.
   sizeFromContents()
 - the checkmark was not properly centered because the wrong rect was
   used

Fixes: QTBUG-129716
Change-Id: Ibe2e5e66367ac0a803788b74175776d95f489c80
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Wladimir Leuschner <wladimir.leuschner@qt.io>
(cherry picked from commit 30d90b4ccad83ab1f23dab7cd72b7e228c299895)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Christian Ehrlicher 2024-10-08 21:43:26 +02:00 committed by Qt Cherry-pick Bot
parent a0f5289db1
commit 47ae9e4c2c
1 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -941,7 +941,7 @@ void QWindows11Style::drawPrimitive(PrimitiveElement element, const QStyleOption
case QStyle::PE_FrameMenu:
break;
case PE_PanelMenu: {
const QRect rect = option->rect.marginsRemoved(QMargins(2, 2, 12, 2));
const QRect rect = option->rect.marginsRemoved(QMargins(2, 2, 2, 2));
QPen pen(WINUI3Colors[colorSchemeIndex][frameColorLight]);
painter->save();
painter->setPen(pen);
@ -1989,10 +1989,6 @@ QSize QWindows11Style::sizeFromContents(ContentsType type, const QStyleOption *o
switch (type) {
case CT_Menu:
contentSize += QSize(10, 0);
break;
#if QT_CONFIG(menubar)
case CT_MenuBarItem:
if (!contentSize.isEmpty()) {
@ -2004,6 +2000,44 @@ QSize QWindows11Style::sizeFromContents(ContentsType type, const QStyleOption *o
}
break;
#endif
#if QT_CONFIG(menu)
case CT_MenuItem:
if (const auto *menuItem = qstyleoption_cast<const QStyleOptionMenuItem *>(option)) {
const int checkcol = qMax<int>(menuItem->maxIconWidth, 32);
int width = size.width();
int height;
if (menuItem->menuItemType == QStyleOptionMenuItem::Separator) {
width = 10;
height = 6;
} else {
height = menuItem->fontMetrics.height() + 8;
if (!menuItem->icon.isNull()) {
int iconExtent = proxy()->pixelMetric(PM_SmallIconSize, option, widget);
height = qMax(height,
menuItem->icon.actualSize(QSize(iconExtent, iconExtent)).height() + 4);
}
}
if (menuItem->text.contains(u'\t'))
width += menuItem->reservedShortcutWidth;
else if (menuItem->menuItemType == QStyleOptionMenuItem::SubMenu)
width += 2 * QWindowsStylePrivate::windowsArrowHMargin;
else if (menuItem->menuItemType == QStyleOptionMenuItem::DefaultItem) {
const QFontMetrics fm(menuItem->font);
QFont fontBold = menuItem->font;
fontBold.setBold(true);
const QFontMetrics fmBold(fontBold);
width += fmBold.horizontalAdvance(menuItem->text) - fm.horizontalAdvance(menuItem->text);
}
width += checkcol;
width += 2 * QWindowsStylePrivate::windowsItemFrame;
if (!menuItem->text.isEmpty()) {
width += QWindowsStylePrivate::windowsItemHMargin;
width += QWindowsStylePrivate::windowsRightBorder;
}
contentSize = QSize(width, height);
}
break;
#endif // QT_CONFIG(menu)
case QStyle::CT_SpinBox: {
if (const auto *spinBoxOpt = qstyleoption_cast<const QStyleOptionSpinBox *>(option)) {
// Add button + frame widths
@ -2072,6 +2106,9 @@ int QWindows11Style::pixelMetric(PixelMetric metric, const QStyleOption *option,
case QStyle::PM_ScrollBarExtent:
res = 12;
break;
case QStyle::PM_SubMenuOverlap:
res = -1;
break;
default:
res = QWindowsVistaStyle::pixelMetric(metric, option, widget);
}