← Back to branch summary

~michael-sheldon/ubuntu-keyboard/fix-1385518-rtm

« back to all changes in this revision

Viewing changes to qml/KeyboardContainer.qml

  • Committer: CI bot
  • Author(s): Michael Sheldon
  • Date: 2014-09-10 14:57:01 UTC
  • mfrom: (215.3.9 fix-1359404)
  • Revision ID: ps-jenkins@lists.canonical.com-20140910145701-j2o8iqkw4qtf4viw
Only switch back automatically from the symbol page if the user presses space or apostrophe and make pre-edit behaviour when entering symbols more consistent. Fixes: 1359404

Show diffs side-by-side

added added

removed removed

Lines of Context:
qml/KeyboardContainer.qml
29
29
    property int keyHeight: 0
30
30
 
31
31
    property bool autoCapsTriggered: false
 
32
    property bool delayedAutoCaps: false
32
33
 
33
34
    property string activeKeypadState: "NORMAL"
34
35
    property alias popoverEnabled: extendedKeysSelector.enabled
46
47
        anchors.fill: parent
47
48
        asynchronous: false
48
49
        source: panel.state === "CHARACTERS" ? internal.characterKeypadSource : internal.symbolKeypadSource
49
 
        onLoaded: activeKeypadState = "NORMAL"
 
50
        onLoaded: {
 
51
            if (delayedAutoCaps) {
 
52
                activeKeypadState = "SHIFTED";
 
53
                delayedAutoCaps = false;
 
54
            } else {
 
55
                activeKeypadState = "NORMAL";
 
56
            }
 
57
        }
50
58
    }
51
59
 
52
60
    ExtendedKeysSelector {
89
97
        }
90
98
    ]
91
99
 
 
100
    onStateChanged: {
 
101
        maliit_input_method.keyboardState = state
 
102
    }
 
103
 
92
104
    QtObject {
93
105
        id: internal
94
106