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

Fusion style: Fix menu item text being elided when mnemonic and && appear in the text

Browse Source 
Pass the text flags to fontMetrics.elidedText().
Amends 0c0892a3e20aa1fa79e3561de9b8e1fa8820f062.

Pick-to: 6.4 6.3 6.2
Task-number: QTBUG-94481
Fixes: QTBUG-103836
Change-Id: I21a9b96ef69e5a5e612a0bdbdf44e5a20931eb59
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Friedemann Kleint 2022-06-13 11:53:34 +02:00
parent 1227af2635
commit 539815569f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1691,7 +1691,8 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio
p->setFont(font); p->setFont(font);
const QFontMetrics fontMetrics(font); const QFontMetrics fontMetrics(font);
const QString textToDraw = fontMetrics.elidedText(s.left(tabIndex).toString(), const QString textToDraw = fontMetrics.elidedText(s.left(tabIndex).toString(),
Qt::ElideMiddle, vTextRect.width()); Qt::ElideMiddle, vTextRect.width(),
text_flags);
if (dis && !act && proxy()->styleHint(SH_EtchDisabledText, option, widget)) { if (dis && !act && proxy()->styleHint(SH_EtchDisabledText, option, widget)) {
p->setPen(menuitem->palette.light().color()); p->setPen(menuitem->palette.light().color());
p->drawText(vTextRect.adjusted(1, 1, 1, 1), text_flags, textToDraw); p->drawText(vTextRect.adjusted(1, 1, 1, 1), text_flags, textToDraw);