Skip to content

Commit

Permalink
Squashed 'maliit-framework/' changes from 314f18e..7e6c51f
Browse files Browse the repository at this point in the history
7e6c51f Merge pull request #12 from pvuorela/preedit_on_reset
0f69a8d Clear preedit state on input context reset

git-subtree-dir: maliit-framework
git-subtree-split: 7e6c51fd817fe9baba62884f011d4b91bb63949e
  • Loading branch information
pvuorela committed Jul 27, 2015
1 parent 873b9a9 commit 60e1f52
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions input-context/minputcontext.cpp
Expand Up @@ -160,6 +160,8 @@ void MInputContext::reset()
if (debug) qDebug() << InputContextName << "in" << __PRETTY_FUNCTION__;

const bool hadPreedit = !preedit.isEmpty();
preedit.clear();
preeditCursorPos = -1;

// reset input method server, preedit requires synchronization.
// rationale: input method might be autocommitting existing preedit without
Expand Down

0 comments on commit 60e1f52

Please sign in to comment.