Fixed stupid minor bugs in Calqlatr and Slide.

Change-Id: I39380e8728bce2341d6fe0b03c3e71c0ffdf5ccc
Reviewed-by: Kimmo Ollila <kimmo.ollila@digia.com>

5 files changed, 9 insertions, 10 deletions

diff --git a/QtDemo/qml/QtDemo/Slide.qml b/QtDemo/qml/QtDemo/Slide.qml
index 7f2b274..a65c928 100644
--- a/QtDemo/qml/QtDemo/Slide.qml
+++ b/QtDemo/qml/QtDemo/Slide.qml
@@ -60,13 +60,12 @@ Item {
 
     ShaderEffectSource{
         id: demo
-        //anchors.centerIn: parent
-        x: width/2
+        anchors.centerIn: parent
         width: demoWidth
         height: demoHeight
         sourceItem: demoContainer
         live: false
-        visible: hasSnapshot && (!slide.loaded || updating)
+        visible: (hasSnapshot && !slide.loaded) || updating
         hideSource: visible && !updating && !loading
         clip: true
 
diff --git a/QtDemo/qml/QtDemo/demos/calqlatr/Calqlatr.qml b/QtDemo/qml/QtDemo/demos/calqlatr/Calqlatr.qml
index 5f6443e..39a0834 100644
--- a/QtDemo/qml/QtDemo/demos/calqlatr/Calqlatr.qml
+++ b/QtDemo/qml/QtDemo/demos/calqlatr/Calqlatr.qml
@@ -46,7 +46,6 @@ import "content/calculator.js" as CalcEngine
 Rectangle {
     id: window
     anchors.fill: parent
-    //focus: true
     color: "#272822"
 
     function operatorPressed(operator) { CalcEngine.operatorPressed(operator) }
@@ -55,7 +54,8 @@ Rectangle {
     Item {
         id: pad
         width: window.width * 0.58
-        NumberPad { y: 10; anchors.horizontalCenter: parent.horizontalCenter }
+        height: window.height * 0.98
+        NumberPad { anchors.horizontalCenter: parent.horizontalCenter }
     }
 
     AnimationController {
diff --git a/QtDemo/qml/QtDemo/demos/calqlatr/content/Button.qml b/QtDemo/qml/QtDemo/demos/calqlatr/content/Button.qml
index 30a7ad9..6165ed3 100644
--- a/QtDemo/qml/QtDemo/demos/calqlatr/content/Button.qml
+++ b/QtDemo/qml/QtDemo/demos/calqlatr/content/Button.qml
@@ -48,13 +48,13 @@ Item {
     signal clicked
 
     width: 0.33*pad.width
-    height: 50
+    height: pad.height/7
 
     Text {
         id: textItem
-        anchors.fill: parent
+        anchors.centerIn: parent
         horizontalAlignment: Text.AlignHCenter
-        font.pixelSize: 48
+        font.pixelSize: parent.height * 0.6
         elide: Text.ElideLeft
         lineHeight: 0.75
         color: "white"
diff --git a/QtDemo/qml/QtDemo/demos/calqlatr/content/NumberPad.qml b/QtDemo/qml/QtDemo/demos/calqlatr/content/NumberPad.qml
index a149753..454c50d 100644
--- a/QtDemo/qml/QtDemo/demos/calqlatr/content/NumberPad.qml
+++ b/QtDemo/qml/QtDemo/demos/calqlatr/content/NumberPad.qml
@@ -42,8 +42,8 @@ import QtQuick 2.0
 
 Grid {
     columns: 3
-    columnSpacing: 2
-    rowSpacing: 16
+    columnSpacing: 0
+    rowSpacing: 0
 
     Button { text: "7" }
     Button { text: "8" }
diff --git a/QtDemo/qml/QtDemo/images/phone1.png b/QtDemo/qml/QtDemo/images/phone1.png
index dec5005..ba7d1e0 100644
--- a/QtDemo/qml/QtDemo/images/phone1.png
+++ b/QtDemo/qml/QtDemo/images/phone1.png