From d100f591f1d9e31ce5396884233ef727f50f4318 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Thu, 7 Mar 2024 18:39:40 +0100 Subject: [PATCH] Don't show mnemonics in dockwidget titles Dockwidget title accelerators doesn't work in dock widgets, so don't show them. This amends cc67b25579c1bb5ea9f5c1ca4c9b7997e66f19b9. Fixes: QTBUG-86407 Pick-to: 6.6 Change-Id: I83fb2da1304d1e2b5eedfc127e5db3d322756d06 Reviewed-by: Sune Vuorela Reviewed-by: Volker Hilsheimer (cherry picked from commit e68c3f025ecc7cf1fa86e5e773cee8d61a816f61) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/styles/mac/qmacstyle_mac.mm | 2 +- src/plugins/styles/modernwindows/qwindowsvistastyle.cpp | 6 +++--- src/widgets/styles/qstylesheetstyle.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm index 2bab19d682a..f1c0169dcc2 100644 --- a/src/plugins/styles/mac/qmacstyle_mac.mm +++ b/src/plugins/styles/mac/qmacstyle_mac.mm @@ -4123,7 +4123,7 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter titleRect.width()); const auto text = p->fontMetrics().elidedText(dwOpt->title, Qt::ElideRight, titleRect.width()); - proxy()->drawItemText(p, titleRect, Qt::AlignCenter, dwOpt->palette, + proxy()->drawItemText(p, titleRect, Qt::AlignCenter | Qt::TextHideMnemonic, dwOpt->palette, dwOpt->state & State_Enabled, text, QPalette::WindowText); } p->restore(); diff --git a/src/plugins/styles/modernwindows/qwindowsvistastyle.cpp b/src/plugins/styles/modernwindows/qwindowsvistastyle.cpp index f9b0091f1a7..57eb46f997a 100644 --- a/src/plugins/styles/modernwindows/qwindowsvistastyle.cpp +++ b/src/plugins/styles/modernwindows/qwindowsvistastyle.cpp @@ -3106,7 +3106,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption QColor textShadow = qRgb(GetRValue(textShadowRef), GetGValue(textShadowRef), GetBValue(textShadowRef)); painter->setPen(textShadow); drawItemText(painter, titleRect.adjusted(1, 1, 1, 1), - Qt::AlignLeft | Qt::AlignBottom, dwOpt->palette, + Qt::AlignLeft | Qt::AlignBottom | Qt::TextHideMnemonic, dwOpt->palette, dwOpt->state & State_Enabled, titleText); } @@ -3114,7 +3114,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption QColor textColor = qRgb(GetRValue(captionText), GetGValue(captionText), GetBValue(captionText)); painter->setPen(textColor); drawItemText(painter, titleRect, - Qt::AlignLeft | Qt::AlignBottom, dwOpt->palette, + Qt::AlignLeft | Qt::AlignBottom | Qt::TextHideMnemonic, dwOpt->palette, dwOpt->state & State_Enabled, titleText); painter->setFont(oldFont); painter->setPen(oldPen); @@ -3129,7 +3129,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption verticalTitleBar ? titleRect.height() : titleRect.width()); const int indent = 4; drawItemText(painter, rect.adjusted(indent + 1, 1, -indent - 1, -1), - Qt::AlignLeft | Qt::AlignVCenter | Qt::TextShowMnemonic, + Qt::AlignLeft | Qt::AlignVCenter | Qt::TextHideMnemonic, dwOpt->palette, dwOpt->state & State_Enabled, titleText, QPalette::WindowText); diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp index fcbe9ae6131..21f2dc75501 100644 --- a/src/widgets/styles/qstylesheetstyle.cpp +++ b/src/widgets/styles/qstylesheetstyle.cpp @@ -4486,7 +4486,7 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q QString titleText = p->fontMetrics().elidedText(dwOpt->title, Qt::ElideRight, r.width()); drawItemText(p, r, - alignment, dwOpt->palette, + alignment | Qt::TextHideMnemonic, dwOpt->palette, dwOpt->state & State_Enabled, titleText, QPalette::WindowText);