From 539815569f277384e8fb8f5dd8645bc34ded1c55 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 13 Jun 2022 11:53:34 +0200 Subject: Fusion style: Fix menu item text being elided when mnemonic and && appear in the text 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 --- src/widgets/styles/qfusionstyle.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/widgets/styles/qfusionstyle.cpp') diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp index 9ee6a30810..dccfbd8aac 100644 --- a/src/widgets/styles/qfusionstyle.cpp +++ b/src/widgets/styles/qfusionstyle.cpp @@ -1691,7 +1691,8 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio p->setFont(font); const QFontMetrics fontMetrics(font); 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)) { p->setPen(menuitem->palette.light().color()); p->drawText(vTextRect.adjusted(1, 1, 1, 1), text_flags, textToDraw); -- cgit v1.2.3