diff options
| author | Robin Burchell <robin.burchell@jollamobile.com> | 2013-11-04 14:18:26 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-04 15:01:30 +0100 |
| commit | d87c1471f1f61133edad313d5159f9fee9e938c5 (patch) | |
| tree | b55770581e6c504f2a2e59d278e9f000c08956ce /src/quick/items/qquicktextnodeengine.cpp | |
| parent | aeb1d48c9938241b1ffcf8e42e3864595e90b168 (diff) | |
Fix preedit text layout
preeditPosition is relative to the block position
Done-with: Aaron Kennedy <aaron.kennedy@jollamobile.com>
Change-Id: If96a1d0939f84ab11f0642d5fe78d786c30f418a
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'src/quick/items/qquicktextnodeengine.cpp')
| -rw-r--r-- | src/quick/items/qquicktextnodeengine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquicktextnodeengine.cpp b/src/quick/items/qquicktextnodeengine.cpp index fe7effa4f1..e9ff70e00b 100644 --- a/src/quick/items/qquicktextnodeengine.cpp +++ b/src/quick/items/qquicktextnodeengine.cpp @@ -898,8 +898,8 @@ void QQuickTextNodeEngine::addTextBlock(QTextDocument *textDocument, const QText int fragmentEnd = textPos + fragment.length(); #ifndef QT_NO_IM if (preeditPosition >= 0 - && preeditPosition >= textPos - && preeditPosition <= fragmentEnd) { + && (preeditPosition + block.position()) >= textPos + && (preeditPosition + block.position()) <= fragmentEnd) { fragmentEnd += preeditLength; } #endif |