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

Don't show mnemonics in dockwidget titles

Browse Source 
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 <sune@vuorela.dk>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit e68c3f025ecc7cf1fa86e5e773cee8d61a816f61)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Christian Ehrlicher 2024-03-07 18:39:40 +01:00 committed by Qt Cherry-pick Bot
parent 712eb47886
commit d100f591f1
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/styles/mac/qmacstyle_mac.mm
View File

@ -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();

6
src/plugins/styles/modernwindows/qwindowsvistastyle.cpp
View File

@ -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);

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

@ -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);