Merge lp:~boiko/dialer-app/fix_1082054 into lp:dialer-app

[Gustavo Pichorim Boiko]

Limit the number of digits to 20 and scale the font down when the numbers don't fit on the screen.

Limit the number of digits to 20 and scale the font down when the numbers don't fit on the screen.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:50
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/61/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dialer-app-saucy-amd64-ci/61/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dialer-app-saucy-armhf-ci/61/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dialer-app-saucy-i386-ci/61/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/dialer-app-ci/61/rebuild

review: Needs Fixing (continuous-integration)

[lp:~boiko/dialer-app/fix_1082054]

51. By Gustavo Pichorim Boiko on 2013-09-30

Merge latest changes from trunk.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:51
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/63/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-saucy-amd64-ci/63
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-saucy-armhf-ci/63
        deb: http://jenkins.qa.ubuntu.com/job/dialer-app-saucy-armhf-ci/63/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-saucy-i386-ci/63

Click here to trigger a rebuild:
http://s-jenkins:8080/job/dialer-app-ci/63/rebuild

review: Approve (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

looks good.
works correctly.

review: Approve

=== modified file 'src/qml/DialerPage/KeypadEntry.qml'
--- src/qml/DialerPage/KeypadEntry.qml	2013-09-30 18:20:58 +0000
+++ src/qml/DialerPage/KeypadEntry.qml	2013-09-30 22:47:54 +0000
@@ -37,23 +37,13 @@
         opacity: 0.05
     }
 
-    Label {
-        id: dots
-        clip: true
-        anchors.left: parent.left
-        anchors.verticalCenter: parent.verticalCenter
-        text: "..."
-        visible: (input.contentWidth > (keypadEntry.width - dots.width))
-        font.pixelSize: input.font.pixelSize
-        font.weight: Font.Light
-        font.family: "Ubuntu"
-        color: "#AAAAAA"
-    }
-
     TextInput {
         id: input
 
-        anchors.left: dots.visible ? dots.right : parent.left
+        property bool __adjusting: false
+
+        anchors.left: parent.left
+        anchors.leftMargin: units.gu(2)
         anchors.right: parent.right
         anchors.rightMargin: units.gu(2)
         anchors.verticalCenter: parent.verticalCenter
@@ -63,6 +53,7 @@
         font.weight: Font.Light
         font.family: "Ubuntu"
         color: "#AAAAAA"
+        maximumLength: 20
         focus: true
         cursorVisible: true
         clip: true
@@ -83,6 +74,25 @@
             if (!cursorVisible)
                 cursorVisible = true
         }
+
+        onContentWidthChanged: {
+            // avoid infinite recursion here
+            if (__adjusting) {
+                return;
+            }
+
+            __adjusting = true;
+
+            // start by resetting the font size to discover the scale that should be used
+            font.pixelSize = units.dp(39);
+
+            // check if it really needs to be scaled
+            if (contentWidth > width) {
+                var factor = width / contentWidth;
+                font.pixelSize = font.pixelSize * factor;
+            }
+            __adjusting = false;
+        }
     }
 
     MouseArea {