Merge lp:~bfiller/ubuntu-keyboard/fix-preedit into lp:ubuntu-keyboard

[Bill Filler]

clear the preedit and word candidates when the focused editor changes by implementing reset() in the plugin

sil's changes plus clear the preedit and word candidates when the focused editor changes by implementing reset() in the plugin. This cause the word candidate list and preedit to be cleared if the keyboard is closed or when the focused editor changes. So after sending a text message with an outstanding preedit the word list and preedit now correclty cleared.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:137
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/331/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/160
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/160
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/160/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/159

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:138
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/332/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/161
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/161
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/161/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/160

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:139
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/333/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/162
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/162
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/162/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/161

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:140
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/340/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/169
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/169
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/169/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/168

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

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

This branch had some problems. While it did fix the issue on the backspace, it didn't solve the problem where the previous uncommited word and word candidates were showing up when you refocused the field. That should be solved now with my branch and the messaging-app branch.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:142
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/342/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/171
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/171
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/171/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/170

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

review: Approve (continuous-integration)

[Łukasz Zemczak (sil2100)]

Awesome, yes - I didn't check the case of switching focus, this way it seems to be cool. Tested and works like a charm, so an overall Approve.

Just a small nitpick if I can: I see some whitespace changes done unnecessarily, like in handleFocusChange and that TODO. And while we're at it, maybe we could 4 spaces instead of 2 in the reset() method? These are really just nitpicks, but since we're anyway blocked by Qt5.2 with ubuntu-keyboard landings, I would say - let's fix it :)

Thanks!

review: Needs Fixing (whitespaces)

[lp:~bfiller/ubuntu-keyboard/fix-preedit]

143. By Bill Filler on 2014-03-12

fix whitespace issues

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:143
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/343/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/172
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/172
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/172/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/171

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

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

fixed whitespace issues, should be good to go

[Łukasz Zemczak (sil2100)]

Awesome!

review: Approve

=== modified file 'src/plugin/inputmethod.cpp'
--- src/plugin/inputmethod.cpp	2014-01-31 17:20:14 +0000
+++ src/plugin/inputmethod.cpp	2014-03-12 18:05:26 +0000
@@ -147,6 +147,15 @@
     d->closeOskWindow();
 }
 
+void InputMethod::reset()
+{
+    //this gets called from Qt when the focused editor changes
+    //we need to clear preedit/word candidates in this case
+    qDebug() << "inputMethod::reset()";
+    Q_D(InputMethod);
+    d->editor.clearPreedit();
+}
+
 void InputMethod::setPreedit(const QString &preedit,
                              int cursor_position)
 {

=== modified file 'src/plugin/inputmethod.h'
--- src/plugin/inputmethod.h	2014-01-21 22:51:18 +0000
+++ src/plugin/inputmethod.h	2014-03-12 18:05:26 +0000
@@ -84,6 +84,7 @@
     virtual void handleFocusChange(bool focusIn);
     virtual void handleAppOrientationChanged(int angle);
     virtual void handleClientChange();
+    virtual void reset();
     virtual bool imExtensionEvent(MImExtensionEvent *event);
     virtual void setKeyOverrides(const QMap<QString, QSharedPointer<MKeyOverride> > &overrides);
     //! \reimp_end

=== modified file 'src/view/abstracttexteditor.cpp'
--- src/view/abstracttexteditor.cpp	2013-11-21 13:26:12 +0000
+++ src/view/abstracttexteditor.cpp	2014-03-12 18:05:26 +0000
@@ -433,7 +433,7 @@
     case Key::ActionSpace: {
         QString textOnLeft = d->text->surroundingLeft() + d->text->preedit();
         const bool auto_caps_activated = d->word_engine->languageFeature()->activateAutoCaps(textOnLeft);
-        const bool replace_preedit = d->auto_correct_enabled && not d->text->primaryCandidate().isEmpty();
+        const bool replace_preedit = d->auto_correct_enabled && not d->text->primaryCandidate().isEmpty() && not d->text->preedit().isEmpty();
 
         if (replace_preedit) {
             const QString &appendix = d->word_engine->languageFeature()->appendixForReplacedPreedit(d->text->preedit());
@@ -572,6 +572,15 @@
 void AbstractTextEditor::clearPreedit()
 {
     replacePreedit("");
+
+    Q_D(AbstractTextEditor);
+
+    if (not d->valid()) {
+        return;
+    }
+
+    qDebug() << "in clear preedit.. clearing word engine";
+    d->word_engine->clearCandidates();
 }
 
 //! \brief Returns whether preedit functionality is enabled.
@@ -756,9 +765,20 @@
         sendKeyEvent(ev);
     } else {
         d->text->removeFromPreedit(1);
+        
         d->word_engine->computeCandidates(d->text.data());
         sendPreeditString(d->text->preedit(), d->text->preeditFace(),
                           Replacement());
+
+        if (d->text->preedit().isEmpty()) {
+            d->word_engine->clearCandidates();
+            d->text->commitPreedit();
+            // XXX: This is something like a workaround for maliit reporting an invalid state to Qt.
+            //  When preedit is cleared, for Qt not reporting it as inputMethodComposing all the time we need
+            //  to flush out all the TextFormat attributes - so we actually need to commit anything for that
+            //  to happen
+            sendCommitString("");
+        }
     }
 
     d->backspace_sent = true;