summaryrefslogtreecommitdiffstats
path: root/src/gui/inputmethod/qcoefepinputcontext_p.h
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-02-05 12:53:12 (GMT)
committeraxis <qt-info@nokia.com>2010-02-05 13:12:55 (GMT)
commitcafc2a861b139c33d3989c625deb76a874159fbe (patch)
tree90e738a7208b37bffd419b67cf6e1f88dda699d5 /src/gui/inputmethod/qcoefepinputcontext_p.h
parent1e8a17edef013e70fa0d0c20a04e713c190c0bec (diff)
downloadQt-cafc2a861b139c33d3989c625deb76a874159fbe.zip
Qt-cafc2a861b139c33d3989c625deb76a874159fbe.tar.gz
Qt-cafc2a861b139c33d3989c625deb76a874159fbe.tar.bz2
Fixed a bug where text would disappear in password fields.
There were two bugs: - First, we need to avoid triggering the CancelTransaction call when committing the temporary preedit text, because otherwise FEP starts sending us spurious backspace events. Since the "triggeredBySymbian" variable is no longer descriptive for that use case, I renamed it in the process and that changed the negation of the flag. Notice the absense of a change inside commitTemporaryPreeditString(). That is because we want that one to avoid the transaction cancel, and therefore wee keep the old negation. - Second, m_cursorPos needs to be kept in sync with the widget state when we send the temporary preedit string, because the input context cannot separate between types of preedit text when it hits the first block in commitCurrentString() (types being either our temporary text, or FEP's text), and we have to avoid the longPress code path. RevBy: Janne Koskinen
Diffstat (limited to 'src/gui/inputmethod/qcoefepinputcontext_p.h')
-rw-r--r--src/gui/inputmethod/qcoefepinputcontext_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/inputmethod/qcoefepinputcontext_p.h b/src/gui/inputmethod/qcoefepinputcontext_p.h
index f325fb9..d5243c3 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_p.h
+++ b/src/gui/inputmethod/qcoefepinputcontext_p.h
@@ -96,7 +96,7 @@ protected:
void timerEvent(QTimerEvent *timerEvent);
private:
- void commitCurrentString(bool triggeredBySymbian);
+ void commitCurrentString(bool cancelFepTransaction);
void updateHints(bool mustUpdateInputCapabilities);
void applyHints(Qt::InputMethodHints hints);
void applyFormat(QList<QInputMethodEvent::Attribute> *attributes);