← Back to branch summary

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

« back to all changes in this revision

Viewing changes to qml/Keyboard.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/Keyboard.qml
252
252
            Connections {
253
253
                target: input_method
254
254
                onActivateAutocaps: {
255
 
                    keypad.state = "CHARACTERS";
256
 
                    keypad.activeKeypadState = "SHIFTED";
257
 
                    keypad.autoCapsTriggered = true;
 
255
                    if (keypad.state == "CHARACTERS") {
 
256
                        keypad.activeKeypadState = "SHIFTED";
 
257
                        keypad.autoCapsTriggered = true;
 
258
                    } else {
 
259
                        keypad.delayedAutoCaps = true;
 
260
                    }
 
261
                }
 
262
 
 
263
                onKeyboardReset: {
 
264
                    keypad.state = "CHARACTERS"
258
265
                }
259
266
            }
260
267