← Back to branch summary

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

« back to all changes in this revision

Viewing changes to qml/keys/CharKey.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/keys/CharKey.qml
43
43
    property string action
44
44
    property bool noMagnifier: false
45
45
    property bool skipAutoCaps: false
 
46
    property bool switchBackFromSymbols: false
46
47
 
47
48
    /* design */
48
49
    property string imgNormal: UI.imageCharKey
203
204
                }
204
205
                else if (!skipAutoCaps) {
205
206
                    if (panel.activeKeypadState === "SHIFTED" && panel.state === "CHARACTERS")
206
 
                        panel.activeKeypadState = "NORMAL"
 
207
                        panel.activeKeypadState = "NORMAL";
 
208
                }
 
209
                if (switchBackFromSymbols && panel.state === "SYMBOLS") {
 
210
                    panel.state = "CHARACTERS";
207
211
                }
208
212
            }
209
213
        }