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

QToolButton: Elide text when constraints prevent from showing whole text

Browse Source 
Follow-up of b2a282d7c7b8f49819bbc86ed705980438ecb04b - elide the text
also when the QToolButton has no icon (=text only)

Fixes: QTBUG-64132
Change-Id: If4d3758452f37df411931a6628846988a3418d8e
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
(cherry picked from commit 021906f6c985b838461d28c7f121d4c3bc7e6499)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Christian Ehrlicher 2023-01-27 16:22:22 +01:00 committed by Qt Cherry-pick Bot
parent cf2f8235d5
commit 8be65ba913
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/qcommonstyle.cpp
View File

@ -1655,8 +1655,9 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt,
alignment |= Qt::TextHideMnemonic; alignment |= Qt::TextHideMnemonic;
rect.translate(shiftX, shiftY); rect.translate(shiftX, shiftY);
p->setFont(toolbutton->font); p->setFont(toolbutton->font);
const QString text = d->toolButtonElideText(toolbutton, rect, alignment);
proxy()->drawItemText(p, rect, alignment, toolbutton->palette, proxy()->drawItemText(p, rect, alignment, toolbutton->palette,
opt->state & State_Enabled, toolbutton->text, opt->state & State_Enabled, text,
QPalette::ButtonText); QPalette::ButtonText);
} else { } else {
QPixmap pm; QPixmap pm;