diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-07-31 12:54:42 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-31 05:04:45 +0200 |
| commit | d3fa72e7e061d8ffd0e7aac8ecabdeadb207929f (patch) | |
| tree | 86e388b6df6b1d065a1f2b696b77b2dcee64f24d /src/quick/items/qquicktext.cpp | |
| parent | c9b7582a2e7ad9fcd03dd999c3b7a16b72803238 (diff) | |
Reset Styled/PlainText specific state when switching between formats.
Fixes markup being displayed when switching from a multilength string
to styled text and formatting of elided text when switching from
elided styled text to elided plain text.
Change-Id: Id1e1834d81cb6142d92433a8bc571e05d226b7b3
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Diffstat (limited to 'src/quick/items/qquicktext.cpp')
| -rw-r--r-- | src/quick/items/qquicktext.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index 87d389b86f..16cf6ac5e9 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -361,8 +361,11 @@ void QQuickTextPrivate::updateLayout() bool fontSizeModified = false; QQuickStyledText::parse(text, layout, imgTags, q->baseUrl(), qmlContext(q), !maximumLineCountValid, &fontSizeModified); formatModifiesFontSize = fontSizeModified; + multilengthEos = -1; } else { layout.clearAdditionalFormats(); + if (elideLayout) + elideLayout->clearAdditionalFormats(); QString tmp = text; multilengthEos = tmp.indexOf(QLatin1Char('\x9c')); if (multilengthEos != -1) { |