From d6d662bba534ba7dc7580c30b62bc97806590aa5 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Wed, 26 Aug 2020 16:40:56 +0200 Subject: Rename QStyleOptionMenuItem::tabWidth to reservedShortcutWidth As per ### Qt 6 comment, and the documentation for the variable. Change-Id: I58df784a72129dc97c5f13eb54e34cb7feb9748c Reviewed-by: Richard Moe Gustavsen --- src/plugins/styles/mac/qmacstyle_mac.mm | 2 +- src/plugins/styles/windowsvista/qwindowsvistastyle.cpp | 2 +- src/plugins/styles/windowsvista/qwindowsxpstyle.cpp | 2 +- src/widgets/styles/qfusionstyle.cpp | 2 +- src/widgets/styles/qstyleoption.cpp | 8 +++++--- src/widgets/styles/qstyleoption.h | 2 +- src/widgets/styles/qstylesheetstyle.cpp | 2 +- src/widgets/styles/qwindowsstyle.cpp | 2 +- src/widgets/widgets/qcombobox.cpp | 2 +- src/widgets/widgets/qcombobox_p.h | 4 ++-- src/widgets/widgets/qmenu.cpp | 8 ++++---- 11 files changed, 19 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm index 708f298af5..443a5840c3 100644 --- a/src/plugins/styles/mac/qmacstyle_mac.mm +++ b/src/plugins/styles/mac/qmacstyle_mac.mm @@ -4279,7 +4279,7 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter yPos += 1; const bool isSubMenu = mi->menuItemType == QStyleOptionMenuItem::SubMenu; - const int tabwidth = isSubMenu ? 9 : mi->tabWidth; + const int tabwidth = isSubMenu ? 9 : mi->reservedShortcutWidth; QString rightMarginText; if (isSubMenu) diff --git a/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp b/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp index 30b3786a80..7ad5fbe34d 100644 --- a/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp +++ b/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp @@ -1198,7 +1198,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption int x, y, w, h; menuitem->rect.getRect(&x, &y, &w, &h); - int tab = menuitem->tabWidth; + int tab = menuitem->reservedShortcutWidth; bool dis = !(menuitem->state & State_Enabled); bool checked = menuitem->checkType != QStyleOptionMenuItem::NotCheckable ? menuitem->checked : false; diff --git a/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp b/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp index 6183e32af2..d00413538b 100644 --- a/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp +++ b/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp @@ -2130,7 +2130,7 @@ void QWindowsXPStyle::drawControl(ControlElement element, const QStyleOption *op case CE_MenuItem: if (const QStyleOptionMenuItem *menuitem = qstyleoption_cast(option)) { - int tab = menuitem->tabWidth; + int tab = menuitem->reservedShortcutWidth; bool dis = !(menuitem->state & State_Enabled); bool act = menuitem->state & State_Selected; bool checkable = menuitem->menuHasCheckableItems; diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp index 3d6c86d20b..1c788dfcd1 100644 --- a/src/widgets/styles/qfusionstyle.cpp +++ b/src/widgets/styles/qfusionstyle.cpp @@ -1686,7 +1686,7 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio } int x, y, w, h; menuitem->rect.getRect(&x, &y, &w, &h); - int tab = menuitem->tabWidth; + int tab = menuitem->reservedShortcutWidth; QColor discol; if (dis) { discol = menuitem->palette.text().color(); diff --git a/src/widgets/styles/qstyleoption.cpp b/src/widgets/styles/qstyleoption.cpp index 4624c6e7f0..aab5696398 100644 --- a/src/widgets/styles/qstyleoption.cpp +++ b/src/widgets/styles/qstyleoption.cpp @@ -1668,7 +1668,8 @@ QStyleOptionProgressBar::QStyleOptionProgressBar(int version) QStyleOptionMenuItem::QStyleOptionMenuItem() : QStyleOption(QStyleOptionMenuItem::Version, SO_MenuItem), menuItemType(Normal), - checkType(NotCheckable), checked(false), menuHasCheckableItems(true), maxIconWidth(0), tabWidth(0) + checkType(NotCheckable), checked(false), menuHasCheckableItems(true), maxIconWidth(0), + reservedShortcutWidth(0) { } @@ -1677,7 +1678,8 @@ QStyleOptionMenuItem::QStyleOptionMenuItem() */ QStyleOptionMenuItem::QStyleOptionMenuItem(int version) : QStyleOption(version, SO_MenuItem), menuItemType(Normal), - checkType(NotCheckable), checked(false), menuHasCheckableItems(true), maxIconWidth(0), tabWidth(0) + checkType(NotCheckable), checked(false), menuHasCheckableItems(true), maxIconWidth(0), + reservedShortcutWidth(0) { } @@ -1821,7 +1823,7 @@ QStyleOptionMenuItem::QStyleOptionMenuItem(int version) */ /*! - \variable QStyleOptionMenuItem::tabWidth + \variable QStyleOptionMenuItem::reservedShortcutWidth \brief the reserved width for the menu item's shortcut QMenu sets it to the width occupied by the widest shortcut among diff --git a/src/widgets/styles/qstyleoption.h b/src/widgets/styles/qstyleoption.h index 600db338df..fb5e92526e 100644 --- a/src/widgets/styles/qstyleoption.h +++ b/src/widgets/styles/qstyleoption.h @@ -366,7 +366,7 @@ public: QString text; QIcon icon; int maxIconWidth; - int tabWidth; // ### Qt 6: rename to reservedShortcutWidth + int reservedShortcutWidth; QFont font; QStyleOptionMenuItem(); diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp index 2f38b72c21..b2f84e2f30 100644 --- a/src/widgets/styles/qstylesheetstyle.cpp +++ b/src/widgets/styles/qstylesheetstyle.cpp @@ -3789,7 +3789,7 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q QRect textRect = subRule.contentsRect(opt->rect); textRect.setLeft(textRect.left() + textRectOffset); - textRect.setWidth(textRect.width() - mi.tabWidth); + textRect.setWidth(textRect.width() - mi.reservedShortcutWidth); const QRect vTextRect = visualRect(opt->direction, m->rect, textRect); QStringView s(mi.text); diff --git a/src/widgets/styles/qwindowsstyle.cpp b/src/widgets/styles/qwindowsstyle.cpp index 763431ecfe..619dbcdb52 100644 --- a/src/widgets/styles/qwindowsstyle.cpp +++ b/src/widgets/styles/qwindowsstyle.cpp @@ -1110,7 +1110,7 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai if (const QStyleOptionMenuItem *menuitem = qstyleoption_cast(opt)) { int x, y, w, h; menuitem->rect.getRect(&x, &y, &w, &h); - int tab = menuitem->tabWidth; + int tab = menuitem->reservedShortcutWidth; bool dis = !(menuitem->state & State_Enabled); bool checked = menuitem->checkType != QStyleOptionMenuItem::NotCheckable ? menuitem->checked : false; diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index 27928a6d01..cf1d4a60fb 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -160,7 +160,7 @@ QStyleOptionMenuItem QComboMenuDelegate::getStyleOption(const QStyleOptionViewIt } menuOption.text = index.model()->data(index, Qt::DisplayRole).toString() .replace(QLatin1Char('&'), QLatin1String("&&")); - menuOption.tabWidth = 0; + menuOption.reservedShortcutWidth = 0; menuOption.maxIconWidth = option.decorationSize.width() + 4; menuOption.menuRect = option.rect; menuOption.rect = option.rect; diff --git a/src/widgets/widgets/qcombobox_p.h b/src/widgets/widgets/qcombobox_p.h index 9751036c53..bff6126d3e 100644 --- a/src/widgets/widgets/qcombobox_p.h +++ b/src/widgets/widgets/qcombobox_p.h @@ -117,7 +117,7 @@ protected: menuOpt.checkType = QStyleOptionMenuItem::NotCheckable; menuOpt.menuRect = e->rect(); menuOpt.maxIconWidth = 0; - menuOpt.tabWidth = 0; + menuOpt.reservedShortcutWidth = 0; QPainter p(viewport()); combo->style()->drawControl(QStyle::CE_MenuEmptyArea, &menuOpt, &p, this); } @@ -193,7 +193,7 @@ protected: menuOpt.checkType = QStyleOptionMenuItem::NotCheckable; menuOpt.menuRect = rect(); menuOpt.maxIconWidth = 0; - menuOpt.tabWidth = 0; + menuOpt.reservedShortcutWidth = 0; menuOpt.menuItemType = QStyleOptionMenuItem::Scroller; if (sliderAction == QAbstractSlider::SliderSingleStepAdd) menuOpt.state |= QStyle::State_DownArrow; diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index eba20445aa..e63a7edc4a 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -961,7 +961,7 @@ void QMenuPrivate::drawScroller(QPainter *painter, QMenuPrivate::ScrollerTearOff menuOpt.state = QStyle::State_None; menuOpt.checkType = QStyleOptionMenuItem::NotCheckable; menuOpt.maxIconWidth = 0; - menuOpt.tabWidth = 0; + menuOpt.reservedShortcutWidth = 0; menuOpt.rect = rect; menuOpt.menuItemType = QStyleOptionMenuItem::Scroller; menuOpt.state |= QStyle::State_Enabled; @@ -986,7 +986,7 @@ void QMenuPrivate::drawTearOff(QPainter *painter, const QRect &rect) menuOpt.state = QStyle::State_None; menuOpt.checkType = QStyleOptionMenuItem::NotCheckable; menuOpt.maxIconWidth = 0; - menuOpt.tabWidth = 0; + menuOpt.reservedShortcutWidth = 0; menuOpt.rect = rect; menuOpt.menuItemType = QStyleOptionMenuItem::TearOff; if (tearoffHighlighted) @@ -1613,7 +1613,7 @@ void QMenu::initStyleOption(QStyleOptionMenuItem *option, const QAction *action) } #endif option->text = textAndAccel; - option->tabWidth = d->tabWidth; + option->reservedShortcutWidth = d->tabWidth; option->maxIconWidth = d->maxIconWidth; option->menuRect = rect(); } @@ -2784,7 +2784,7 @@ void QMenu::paintEvent(QPaintEvent *e) menuOpt.state = QStyle::State_None; menuOpt.checkType = QStyleOptionMenuItem::NotCheckable; menuOpt.maxIconWidth = 0; - menuOpt.tabWidth = 0; + menuOpt.reservedShortcutWidth = 0; style()->drawPrimitive(QStyle::PE_PanelMenu, &menuOpt, &p, this); //calculate the scroll up / down rect -- cgit v1.2.3