Merge lp:~michael-sheldon/ubuntu-keyboard/fix-1428584 into lp:ubuntu-keyboard

[Michael Sheldon]

Account for keys at the side of the keyboard being extended in size when calculating autopilot key positions

Account for keys at the side of the keyboard being extended in size when calculating autopilot key positions

[Michael Sheldon (michael-sheldon)]

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/ubuntu-keyboard) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * No change

If you changed UI labels, did you update the pot file?

 * No change

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * No change

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:335
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/564/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1702
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/65
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/65
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/65/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/65
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1510
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1700
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1700/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18703

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/564/rebuild

review: Approve (continuous-integration)

=== modified file 'qml/keys/CharKey.qml'
--- qml/keys/CharKey.qml	2015-02-13 20:14:07 +0000
+++ qml/keys/CharKey.qml	2015-03-10 13:59:05 +0000
@@ -49,6 +49,11 @@
     property bool leftSide: false
     property bool rightSide: false
 
+    // These properties are used by autopilot to determine the visible 
+    // portion of the key to press
+    readonly property double leftOffset: buttonImage.anchors.leftMargin
+    readonly property double rightOffset: buttonImage.anchors.rightMargin
+
     /* design */
     property string imgNormal: UI.imageCharKey
     property string imgPressed: UI.imageCharKeyPressed
 
=== modified file 'tests/autopilot/ubuntu_keyboard/emulators/keypad.py'
--- tests/autopilot/ubuntu_keyboard/emulators/keypad.py	2015-02-09 17:22:29 +0000
+++ tests/autopilot/ubuntu_keyboard/emulators/keypad.py	2015-03-10 13:59:05 +0000
@@ -43,7 +43,12 @@
         def _iter_keys(key_type, label_fn):
             for key in self.select_many(key_type):
                 with key.no_automatic_refreshing():
-                    key_pos = Key.Pos(*key.globalRect)
+                    rect = key.globalRect
+                    if key.leftSide:
+                        rect = (key.globalRect[0] + key.leftOffset, key.globalRect[1], key.globalRect[2] - key.leftOffset, key.globalRect[3])
+                    elif key.rightSide:
+                        rect = (key.globalRect[0], key.globalRect[1], key.globalRect[2] - key.rightOffset, key.globalRect[3])
+                    key_pos = Key.Pos(*rect)
                     label = label_fn(key)
                     if label != '':
                         contained_keys[label] = KeyPadState.NORMAL