Merge lp:~michael-sheldon/ubuntu-keyboard/preedit-fixes into lp:ubuntu-keyboard

[Michael Sheldon]

Re-enter pre-edit after changing focus whilst still in a word (e.g. after swiping keyboard down and then tapping back in text field) or deleting punctuation characters and fix the pre-edit offset when deleting by holding backspace.

Re-enter pre-edit after changing focus whilst still in a word (e.g. after swiping keyboard down and then tapping back in text field), fix the pre-edit offset when deleting by holding backspace and re-enter pre-edit after deleting punctuation characters.

[Michael Sheldon (michael-sheldon)]

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/ubuntu-keyboard) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * No changes

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * No changes

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:194
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/423/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/48
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/48/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/48

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/423/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

tested, works

review: Approve

=== modified file 'src/plugin/inputmethod.cpp'
--- src/plugin/inputmethod.cpp	2014-07-22 14:02:39 +0000
+++ src/plugin/inputmethod.cpp	2014-07-25 10:30:36 +0000
@@ -133,6 +133,7 @@
 
     d->view->setVisible(true);
     d->m_geometry->setShown(true);
+    d->editor.checkPreeditReentry(false);
 }
 
 void InputMethod::hide()

=== modified file 'src/view/abstracttexteditor.cpp'
--- src/view/abstracttexteditor.cpp	2014-07-22 14:02:39 +0000
+++ src/view/abstracttexteditor.cpp	2014-07-25 10:30:36 +0000
@@ -486,11 +486,13 @@
     case Key::ActionBackspace: {
         if (not d->backspace_sent) {
             singleBackspace();
+            checkPreeditReentry(true);
+        } else {
+            checkPreeditReentry(false);
         }
 
         d->auto_repeat_backspace_timer.stop();
         d->repeating_backspace = false;
-        checkPreeditReentry();
         d->word_engine->computeCandidates(d->text.data());
     } break;
 
@@ -996,7 +998,7 @@
 
 //! \brief AbstractTextEditor::checkPreeditReentry  Checks to see whether we should
 //! place a word back in to pre-edit after a character has been deleted
-void AbstractTextEditor::checkPreeditReentry()
+void AbstractTextEditor::checkPreeditReentry(bool uncommittedDelete)
 {
     if(!text()->preedit().isEmpty() || !isPreeditEnabled()) {
         return;
@@ -1004,17 +1006,27 @@
 
     int currentOffset = text()->surroundingOffset();
     if(currentOffset > 1 && !text()->surrounding().isEmpty()) {
-        // -2 for just deleted character that hasn't been committed and to reach character before cursor
-        QString lastChar = text()->surrounding().at(currentOffset-2);
+        QString lastChar;
+        if(uncommittedDelete) {
+            // -2 for just deleted character that hasn't been committed and to reach character before cursor
+            lastChar = text()->surrounding().at(currentOffset-2);
+        } else {
+            lastChar = text()->surrounding().at(currentOffset-1);
+        }
         if(!QRegExp("\\W+").exactMatch(lastChar)) {
             QStringList leftWords = text()->surroundingLeft().trimmed().split(QRegExp("\\W+"));
             int trimDiff = text()->surroundingLeft().size() - text()->surroundingLeft().trimmed().size();
+            if(leftWords.last().isEmpty()) {
+                // If removed char was punctuation trimming will result in an empty entry
+                leftWords.removeLast();
+                trimDiff += 1;
+            }
             if(!text()->surroundingRight().trimmed().isEmpty()) {
                 // We don't currently handle reentering preedit in the middle of the text
                 return;
             }
             QString recreatedPreedit = leftWords.last();
-            if(trimDiff == 0) {
+            if(trimDiff == 0 && uncommittedDelete) {
                 // Remove the last character from the word if we weren't just deleting a space
                 // as the last backspace hasn't been committed yet.
                 recreatedPreedit.chop(1);

=== modified file 'src/view/abstracttexteditor.h'
--- src/view/abstracttexteditor.h	2014-07-22 14:02:39 +0000
+++ src/view/abstracttexteditor.h	2014-07-25 10:30:36 +0000
@@ -109,6 +109,8 @@
     Model::Text * text() const;
     Logic::AbstractWordEngine * wordEngine() const;
 
+    void checkPreeditReentry(bool uncommittedDelete);
+
     Q_SLOT void onKeyPressed(const Key &key);
     Q_SLOT void onKeyReleased(const Key &key);
     Q_SLOT void onKeyEntered(const Key &key);
@@ -170,8 +172,6 @@
 
     void sendKeyPressAndReleaseEvents(int key, Qt::KeyboardModifiers modifiers,
                                       const QString& text = QString());
-
-    void checkPreeditReentry();
 };
 
 } // namespace MaliitKeyboard