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

QPainter: Fix regression in drawText with empty rect and DontClip flag

Browse Source 
A recent bugfix introduced a shortcut in text layouting, skipping all
layout when the cliprect parameter is empty, since all will be clipped
away anyway. However, the case when the DontClip flag is set was
overlooked. This commit rectifies that.

This commit modifies c7df8dda8b60b4e4e7b1859f462d65cef5d8c85b

Fixes: QTBUG-129914
Change-Id: Ief44acdd08e5e5f5491241362aacfcd2083f011d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
(cherry picked from commit b587e7143d7f1eeb6686b52727fbb9d7db6a820c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Eirik Aavitsland 2024-10-10 17:58:48 +02:00 committed by Qt Cherry-pick Bot
parent 7d858ad28c
commit a012e558d5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/painting/qpainter.cpp
View File

@ -7100,7 +7100,7 @@ void qt_format_text(const QFont &fnt, const QRectF &_r,
Q_ASSERT( !((tf & ~Qt::TextDontPrint)!=0 && option!=nullptr) ); // we either have an option or flags
if (_r.isEmpty()) {
if (_r.isEmpty() && !(tf & Qt::TextDontClip)) {
if (!brect)
return;
else