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

Proposed by Gustavo Pichorim Boiko
Status: Merged
Approved by: Bill Filler
Approved revision: 282
Merged at revision: 286
Proposed branch: lp:~boiko/dialer-app/resize_text_hint
Merge into: lp:dialer-app
Diff against target: 44 lines (+10/-3)
2 files modified
src/qml/DialerPage/DialerPage.qml (+2/-2)
src/qml/DialerPage/KeypadEntry.qml (+8/-1)
To merge this branch: bzr merge lp:~boiko/dialer-app/resize_text_hint
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+235232@code.launchpad.net

Commit message

Make sure the keypad entry hint is scaled if the text is too big (the text
translated into some languages might not fit).

Description of the change

Make sure the keypad entry hint is scaled if the text is too big (the text
translated into some languages might not fit).

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
282. By Gustavo Pichorim Boiko

Center the hint text.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/qml/DialerPage/DialerPage.qml'
2--- src/qml/DialerPage/DialerPage.qml 2014-09-16 17:56:36 +0000
3+++ src/qml/DialerPage/DialerPage.qml 2014-09-19 18:09:28 +0000
4@@ -210,7 +210,7 @@
5 left: parent.left
6 verticalCenter: parent.verticalCenter
7 }
8- width: units.gu(4)
9+ width: opacity > 0 ? units.gu(4) : 0
10 height: (keypadEntry.value !== "" && contactWatcher.isUnknown) ? parent.height : 0
11 icon: "contact-new"
12 iconWidth: units.gu(3)
13@@ -251,7 +251,7 @@
14 right: parent.right
15 verticalCenter: parent.verticalCenter
16 }
17- width: units.gu(4)
18+ width: opacity > 0 ? units.gu(4) : 0
19 height: input.text !== "" ? parent.height : 0
20 icon: "erase"
21 iconWidth: units.gu(3)
22
23=== modified file 'src/qml/DialerPage/KeypadEntry.qml'
24--- src/qml/DialerPage/KeypadEntry.qml 2014-09-11 20:55:31 +0000
25+++ src/qml/DialerPage/KeypadEntry.qml 2014-09-19 18:09:28 +0000
26@@ -121,10 +121,17 @@
27 Label {
28 id: hint
29 visible: input.text === ""
30- anchors.centerIn: parent
31+ anchors {
32+ left: parent.left
33+ right: parent.right
34+ verticalCenter: parent.verticalCenter
35+ }
36+
37 text: ""
38 font.pixelSize: input.maximumFontSize
39+ fontSizeMode: Text.HorizontalFit
40 color: UbuntuColors.darkGrey
41 opacity: 0.9
42+ horizontalAlignment: Text.AlignHCenter
43 }
44 }

Subscribers

People subscribed via source and target branches