Merge lp:~gcollura/ubuntu-calculator-app/fix-button-height into lp:ubuntu-calculator-app

[Giulio Collura]

Fix button height on certain devices and window sizes. Fix PortraitKeyboard filename.

This is only a first attempt, if it works for you, you can approve this merge proposal until we find a better solution after the ubuntu phone release.
I'm requesting also the attention of popey, since this fix targets the bug with landscape mode on krillin.
Thanks

Giulio

ps: I've also changed the PortraitKeyboard.qml file name, I hope you don't mind :)

[Bartosz Kosiorek (gang65)]

Nice work.

It is working perfectly for me.

Can we adjust default buttonRatio (to 0.6) for Portrait, to be the same for both keyboards (Portrait and Landscape)?
So both keyboards will look almost the same.

review: Needs Information

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Looks much better!

http://people.canonical.com/~alan/screenshots/device-2015-01-29-212902.png

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:82
http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-ci/78/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/879
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/879/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-vivid-amd64-ci/78

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-ci/78/rebuild

review: Approve (continuous-integration)

[lp:~gcollura/ubuntu-calculator-app/fix-button-height]

83. By Giulio Collura on 2015-01-29

set 0.6 ratio for portrait keyboard as well

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:83
http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-ci/81/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/888
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/888/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-vivid-amd64-ci/81

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-ci/81/rebuild

review: Approve (continuous-integration)

[Bartosz Kosiorek (gang65)]

review: Approve

=== modified file 'app/ubuntu-calculator-app.qml'
--- app/ubuntu-calculator-app.qml	2015-01-27 00:41:25 +0000
+++ app/ubuntu-calculator-app.qml	2015-01-29 22:17:44 +0000
@@ -469,7 +469,7 @@
         Loader {
             id: keyboardLoader
             width: parent.width
-            source: scrollableView.width > scrollableView.height ? "ui/LandscapeKeyboard.qml" : "ui/PortraiKeyboard.qml"
+            source: scrollableView.width > scrollableView.height ? "ui/LandscapeKeyboard.qml" : "ui/PortraitKeyboard.qml"
             opacity: ((y+height) >= scrollableView.contentY) && (y <= (scrollableView.contentY + scrollableView.height)) ? 1 : 0
         }
     }

=== modified file 'app/ui/KeyboardPage.qml'
--- app/ui/KeyboardPage.qml	2014-12-11 09:59:23 +0000
+++ app/ui/KeyboardPage.qml	2015-01-29 22:17:44 +0000
@@ -41,6 +41,7 @@
       0.5 means the button's height will be half the button's width
     */
     property real buttonRatio: 0.7
+    property real buttonMaxHeight: units.gu(10)
 
     spacing: units.gu(1)
 
@@ -104,7 +105,7 @@
         Loader {
             sourceComponent: model.text ? buttonComponent : undefined
 
-            height: width * keyboardRoot.buttonRatio
+            height: Math.min(width * keyboardRoot.buttonRatio, keyboardRoot.buttonMaxHeight)
             width: keyboardRoot.width / keyboardRoot.columns - keyboardRoot.spacing
 
             Component {
@@ -112,7 +113,7 @@
 
                 Item {
                     KeyboardButton {
-                        height: repeater.baseSize * keyboardRoot.buttonRatio * model.hFactor + (keyboardRoot.spacing * (model.hFactor - 1))
+                        height: Math.min(repeater.baseSize * keyboardRoot.buttonRatio, keyboardRoot.buttonMaxHeight) * model.hFactor + (keyboardRoot.spacing * (model.hFactor - 1))
                         width: repeater.baseSize * model.wFactor + (keyboardRoot.spacing * (model.wFactor - 1))
                         text: model.text
                         objectName: model.objectName

=== modified file 'app/ui/LandscapeKeyboard.qml'
--- app/ui/LandscapeKeyboard.qml	2015-01-23 13:32:46 +0000
+++ app/ui/LandscapeKeyboard.qml	2015-01-29 22:17:44 +0000
@@ -5,7 +5,8 @@
     id: calcKeyboard
 
     KeyboardPage {
-        buttonRatio: 0.7
+        buttonRatio: 0.6
+        buttonMaxHeight: scrollableView.height / 10.0
         columns: 8
 
         keyboardModel: new Array(

=== renamed file 'app/ui/PortraiKeyboard.qml' => 'app/ui/PortraitKeyboard.qml'
--- app/ui/PortraiKeyboard.qml	2015-01-10 15:41:43 +0000
+++ app/ui/PortraitKeyboard.qml	2015-01-29 22:17:44 +0000
@@ -5,7 +5,8 @@
     id: calcKeyboard
 
     KeyboardPage {
-        buttonRatio: 0.7
+        buttonRatio: 0.6
+        buttonMaxHeight: scrollableView.height / 10.0
 
         keyboardModel: new Array(
             { text: "←", name: "clear", action: "delete", kbdKeys: [Qt.Key_Backspace] },
@@ -31,6 +32,7 @@
 
     KeyboardPage {
         buttonRatio: 0.7
+        buttonMaxHeight: scrollableView.height / 10.0
 
         keyboardModel: new Array(
             { text: "xⁿ", name: "power", pushText: "^", kbdKeys: [Qt.Key_AsciiCircum] },