583a81cc1c
When calculating the maximum width of a text layout, we would add the text width of each substring *after* we had added the negative right bearing of the last character to it. But the bearing of the last character in a wrapped substring does not actually add to the maximum width unless it is the last character of the *whole* string. Prior to 250117086ff15bba79df8f0e15ee66192edc9ea9 this was not noticed, because the last glyph in the substring would typically be a space and the space does not have any bearings (when doing wrapping on individual characters it could still happen). After the change, the previous glyph for which we get the right bearing will be the last non-whitespace glyph. If this happened to have a negative right bearing, we would add this to the max width and end up with a larger max width than we should. This caused a test failure in tst_qquicktext. This test prefers the text width without the bearing (i.e. the *advance* of the substring) unless the line is manually wrapped or it is the last line of the layout. Change-Id: Iba1a5ad48d575683672400f0572dfa683a0f2d9c Reviewed-by: Lars Knoll <lars@knoll.priv.no> (cherry picked from commit c08a92307d6d9fa9d9d9a1f301e3f2a65374e99a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 610ee0c5040cac4989a1f624e7678f83668e99a0) Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> |
||
|---|---|---|
| .. | ||
| image | ||
| itemmodels | ||
| kernel | ||
| math3d | ||
| painting | ||
| platform | ||
| qopengl | ||
| qopenglconfig | ||
| qvulkan | ||
| rhi | ||
| text | ||
| util | ||
| CMakeLists.txt | ||