diff options
| author | Vladimir Belyavsky <belyavskyv@gmail.com> | 2022-09-16 21:24:17 +0300 |
|---|---|---|
| committer | Vladimir Belyavsky <belyavskyv@gmail.com> | 2022-09-20 06:52:21 +0000 |
| commit | 013c346a8dcbd618febb07884c64c740daf9754d (patch) | |
| tree | ae51601e1f280a19fd955180cca8c4b2a168fb82 /src/gui/text/qtextengine_p.h | |
| parent | 53086094d8d2721a05c6e205e6217b17b92cc618 (diff) | |
QTextLayout: fix maximumWidth() for a text containing line separator
When laying out, we need to increase layout's maximum width _only_
if the previous line was not explicitly wrapped by a line or paragraph
separator, or if the current line's width is greater than the
previously accumulated layout's maximum width.
Fixes: QTBUG-89557
Fixes: QTBUG-104986
Pick-to: 6.2 6.4
Change-Id: Ib7cc4b9dda8f20166dcbd5cfd3b56424bb33d14a
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/gui/text/qtextengine_p.h')
| -rw-r--r-- | src/gui/text/qtextengine_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h index c653bfc92f..c207ab63ae 100644 --- a/src/gui/text/qtextengine_p.h +++ b/src/gui/text/qtextengine_p.h @@ -385,6 +385,7 @@ public: uint layoutState : 2; uint memory_on_stack : 1; uint haveCharAttributes : 1; + uint previousLineManuallyWrapped : 1; QString string; bool reallocate(int totalGlyphs); }; |