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

[Michael Sheldon]

Scale custom return key labels so that more characters fit and set correct default font size

Scale custom return key labels so that more characters fit and set correct default font size

[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?

 * Yes

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)]

FAILED: Continuous integration, rev:245
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/510/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/11/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/11/console

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

review: Needs Fixing (continuous-integration)

[Bill Filler (bfiller)]

tested, works

review: Approve

=== modified file 'qml/keys/CharKey.qml'
--- qml/keys/CharKey.qml	2014-10-07 15:44:46 +0000
+++ qml/keys/CharKey.qml	2014-11-19 15:22:30 +0000
@@ -135,6 +135,8 @@
                 color: UI.fontColor
                 anchors.right: parent.right
                 anchors.left: parent.left
+                anchors.leftMargin: units.gu(0.2)
+                anchors.rightMargin: units.gu(0.2)
                 anchors.verticalCenter: parent.verticalCenter 
                 anchors.verticalCenterOffset: -units.gu(0.15)
                 horizontalAlignment: Text.AlignHCenter

=== modified file 'qml/keys/ReturnKey.qml'
--- qml/keys/ReturnKey.qml	2014-09-10 09:44:55 +0000
+++ qml/keys/ReturnKey.qml	2014-11-19 15:22:30 +0000
@@ -15,6 +15,7 @@
  */
 
 import QtQuick 2.0
+import "key_constants.js" as UI
 
 ActionKey {
     property var actionKeyOverride: maliit_input_method.actionKeyOverride
@@ -24,6 +25,8 @@
     enabled: actionKeyOverride ? actionKeyOverride.enabled : true
     // overrideIcon has high priority over label
     label: overrideIconName == "" ? overrideLabel : ""
+    // Scale the font so the label fits if a long word is set
+    fontSize: units.gu(UI.symbolShiftKeyFontSize) * (4 / (label.length >= 4 ? (label.length <= 6 ? label.length : 6) : 4));
     shifted: label
 
     iconNormal: (overrideIconName == "") && (overrideLabel == "") ? "keyboard-return" : overrideIconName