1
=== modified file 'src/view/abstracttexteditor.cpp'
2
--- src/view/abstracttexteditor.cpp	2013-11-21 13:26:12 +0000
3
+++ src/view/abstracttexteditor.cpp	2014-03-06 09:41:46 +0000
4
@@ -433,7 +433,7 @@
5
433
    case Key::ActionSpace: {
433
    case Key::ActionSpace: {
6
434
        QString textOnLeft = d->text->surroundingLeft() + d->text->preedit();
434
        QString textOnLeft = d->text->surroundingLeft() + d->text->preedit();
7
435
        const bool auto_caps_activated = d->word_engine->languageFeature()->activateAutoCaps(textOnLeft);
435
        const bool auto_caps_activated = d->word_engine->languageFeature()->activateAutoCaps(textOnLeft);
9
436
        const bool replace_preedit = d->auto_correct_enabled && not d->text->primaryCandidate().isEmpty();
436
        const bool replace_preedit = d->auto_correct_enabled && not d->text->primaryCandidate().isEmpty() && not d->text->preedit().isEmpty();
10
437
437
11
438
        if (replace_preedit) {
438
        if (replace_preedit) {
12
439
            const QString &appendix = d->word_engine->languageFeature()->appendixForReplacedPreedit(d->text->preedit());
439
            const QString &appendix = d->word_engine->languageFeature()->appendixForReplacedPreedit(d->text->preedit());
13
@@ -756,9 +756,20 @@
14
756
        sendKeyEvent(ev);
756
        sendKeyEvent(ev);
15
757
    } else {
757
    } else {
16
758
        d->text->removeFromPreedit(1);
758
        d->text->removeFromPreedit(1);
17
759
        
18
759
        d->word_engine->computeCandidates(d->text.data());
760
        d->word_engine->computeCandidates(d->text.data());
19
760
        sendPreeditString(d->text->preedit(), d->text->preeditFace(),
761
        sendPreeditString(d->text->preedit(), d->text->preeditFace(),
20
761
                          Replacement());
762
                          Replacement());
21
763
22
764
        if (d->text->preedit().isEmpty()) {
23
765
            d->word_engine->clearCandidates();
24
766
            d->text->commitPreedit();
25
767
            // XXX: This is something like a workaround for maliit reporting an invalid state to Qt.
26
768
            //  When preedit is cleared, for Qt not reporting it as inputMethodComposing all the time we need
27
769
            //  to flush out all the TextFormat attributes - so we actually need to commit anything for that
28
770
            //  to happen
29
771
            sendCommitString("");
30
772
        }
31
762
    }
773
    }
32
763
774
33
764
    d->backspace_sent = true;
775
    d->backspace_sent = true;
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2014-03-06
Ubuntu Phablet Team		2014-02-24	Pending
Review via email: mp+207878@code.launchpad.net