summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2011-01-17 13:44:44 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2011-01-18 08:31:54 (GMT)
commitec2738b658d25d9fd45cc46cbc19a30e4a39d499 (patch)
tree45a9219a3d4210899cb66c3e8b88e7ff7b81b060 /src/gui
parentbdebd3a3c1f66f7e6a7e0b33f21573f07d31946a (diff)
downloadQt-ec2738b658d25d9fd45cc46cbc19a30e4a39d499.zip
Qt-ec2738b658d25d9fd45cc46cbc19a30e4a39d499.tar.gz
Qt-ec2738b658d25d9fd45cc46cbc19a30e4a39d499.tar.bz2
Fix one character displacement for cursor in line edits
The variable m_inlinePosition was not updated when m_preeditString was cleared in QCoeFepInputContext. This resulted in cursor displaying up one character beyond where it logically should have been when using HW Qwerty keyboard on E7 and similar devices. Task-number: QTBUG-16238 Reviewed-by: axis (cherry picked from commit 81351f2c6f9a939e4c34cb3be6280d396c21941f)
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/inputmethod/qcoefepinputcontext_s60.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index ff199b1..1bef64d 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -706,6 +706,7 @@ void QCoeFepInputContext::CancelFepInlineEdit()
QInputMethodEvent event(QLatin1String(""), attributes);
event.setCommitString(QLatin1String(""), 0, 0);
m_preeditString.clear();
+ m_inlinePosition = 0;
sendEvent(event);
}
@@ -853,6 +854,7 @@ void QCoeFepInputContext::commitCurrentString(bool cancelFepTransaction)
QInputMethodEvent event(QLatin1String(""), attributes);
event.setCommitString(m_preeditString, 0, 0);
m_preeditString.clear();
+ m_inlinePosition = 0;
sendEvent(event);
m_hasTempPreeditString = false;