1
=== modified file 'src/view/abstracttexteditor.cpp'
2
--- src/view/abstracttexteditor.cpp	2016-04-27 23:37:27 +0000
3
+++ src/view/abstracttexteditor.cpp	2016-06-14 15:13:53 +0000
4
@@ -428,7 +428,7 @@
5
428
                d->word_engine->computeCandidates(d->text.data());
428
                d->word_engine->computeCandidates(d->text.data());
6
429
            }
429
            }
7
430
430
9
431
            if (!d->word_engine->languageFeature()->showPrimaryInPreedit()) {
431
            if (!d->word_engine->languageFeature()->showPrimaryInPreedit() && d->preedit_enabled) {
10
432
                sendPreeditString(d->text->preedit(), d->text->preeditFace(),
432
                sendPreeditString(d->text->preedit(), d->text->preeditFace(),
11
433
                                  Replacement(d->text->cursorPosition()));
433
                                  Replacement(d->text->cursorPosition()));
12
434
            }
434
            }
13
@@ -535,10 +535,8 @@
14
535
535
15
536
        if (d->word_engine->languageFeature()->commitOnSpace() || full_stop_inserted) {
536
        if (d->word_engine->languageFeature()->commitOnSpace() || full_stop_inserted) {
16
537
            commitPreedit();
537
            commitPreedit();
21
538
        } else {
538
        } else if (d->preedit_enabled) {
22
539
            if (d->preedit_enabled) {
539
            d->word_engine->computeCandidates(d->text.data());
19
540
                d->word_engine->computeCandidates(d->text.data());
20
541
            }
23
542
540
24
543
            sendPreeditString(d->text->preedit(), d->text->preeditFace(),
541
            sendPreeditString(d->text->preedit(), d->text->preeditFace(),
25
544
                              Replacement(d->text->cursorPosition()));
542
                              Replacement(d->text->cursorPosition()));
26
545
543
27
=== modified file 'tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py'
28
--- tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py	2016-04-28 00:42:26 +0000
29
+++ tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py	2016-06-14 15:13:53 +0000
30
@@ -1359,6 +1359,55 @@
31
1359
            Eventually(Equals(False))
1359
            Eventually(Equals(False))
32
1360
        )
1360
        )
33
1361
1361
34
1362
    def test_double_caps(self):
35
1363
        """Ensure that we switch back to lowercase after typing a letter in
36
1364
        Oxide.
37
1365
38
1366
        """
39
1367
        qml = dedent("""
40
1368
        import QtQuick 2.4
41
1369
        import Ubuntu.Components 1.3
42
1370
        import Ubuntu.Web 0.2
43
1371
44
1372
        Rectangle {
45
1373
            id: window
46
1374
            objectName: "windowRectangle"
47
1375
            color: "lightgrey"
48
1376
49
1377
            WebView {
50
1378
                anchors.fill: parent
51
1379
                objectName: "webview"
52
1380
                Component.onCompleted: {
53
1381
                    loadHtml("
54
1382
                        <html><body><textarea id='textarea'
55
1383
                        style='width: 100%; height: 100%;'></textarea>
56
1384
                        </body></html>"
57
1385
                    );
58
1386
                }
59
1387
            }
60
1388
        }
61
1389
62
1390
        """)
63
1391
        gsettings = Gio.Settings.new("com.canonical.keyboard.maliit")
64
1392
        gsettings.set_boolean("auto-capitalization", True)
65
1393
        gsettings.set_boolean("auto-completion", False)
66
1394
        gsettings.set_boolean("predictive-text", False)
67
1395
        gsettings.set_boolean("spell-checking", False)
68
1396
69
1397
        app = self._start_qml_script(qml)
70
1398
        webview = app.select_single(objectName='webview')
71
1399
72
1400
        self.ensure_focus_on_input(webview)
73
1401
        keyboard = Keyboard()
74
1402
        self.addCleanup(keyboard.dismiss)
75
1403
76
1404
        keyboard.type('H')
77
1405
78
1406
        self.assertThat(
79
1407
            keyboard.active_keypad_state,
80
1408
            Eventually(Equals(KeyPadState.NORMAL))
81
1409
        )
82
1410
83
1362
1411
84
1363
class UbuntuKeyboardPluginPaths(UbuntuKeyboardTests):
1412
class UbuntuKeyboardPluginPaths(UbuntuKeyboardTests):
85
1364
1413
Reviewer	Review Type	Date Requested	Status
system-apps-ci-bot	continuous-integration		Approve on 2016-06-14
PS Jenkins bot	continuous-integration		Pending
Ubuntu Phablet Team		2016-06-10	Pending
Review via email: mp+297047@code.launchpad.net