diff options
author | Shinichi Okada <shinichi.okada@qt.io> | 2020-11-17 14:15:50 +0900 |
---|---|---|
committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-11-23 10:03:55 +0100 |
commit | ea55537d8153195cfd11fd510abce4584c599db0 (patch) | |
tree | 9cd4d100a6e5f9f11f5514a405ad7dea52481cf1 /src/quick/items | |
parent | 702aa21390a2a76afcc95000eb63a80301f006a0 (diff) |
QML Text doesn't reset lineCount when text is empty
lineCount is not reset when replacing a multi-line QML Text 'text'
property with an "" empty string. Also, the lineCountChanged signal is
not emitted
Task-number: QTBUG-84458
Change-Id: Ic3c02e6a90e6675eadbaafc6af6ab0356ee98123
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit ae1b9c6d94001411efeef600e22638906e0fa990)
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/quick/items')
-rw-r--r-- | src/quick/items/qquicktext.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index 384b395f70..0546f80fd5 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -399,6 +399,8 @@ void QQuickTextPrivate::updateSize() layedOutTextRect = QRectF(0, 0, 0, fontHeight); advance = QSizeF(); signalSizeChange(previousSize); + lineCount = 1; + emit q->lineCountChanged(); updateType = UpdatePaintNode; q->update(); return; |