From 9212027697bad66cc493b8d8f2cffb2a8547f982 Mon Sep 17 00:00:00 2001
From: Andy Nichols <andy.nichols@digia.com>
Date: Wed, 19 Feb 2014 16:21:25 +0100
Subject: Fix layout issues with Qt-Everywhere (touchgallery)

Change-Id: I852d90b1c6afdc0316c7d4e45415c53eda94066a
Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
---
 basicsuite/qt5-everywhere/demos/touchgallery/content/ButtonPage.qml | 2 +-
 .../qt5-everywhere/demos/touchgallery/content/ProgressBarPage.qml   | 6 +++---
 basicsuite/qt5-everywhere/demos/touchgallery/content/SliderPage.qml | 3 +++
 basicsuite/qt5-everywhere/demos/touchgallery/content/TabBarPage.qml | 2 +-
 .../qt5-everywhere/demos/touchgallery/content/TextInputPage.qml     | 2 +-
 basicsuite/qt5-everywhere/demos/touchgallery/main.qml               | 4 ++--
 basicsuite/qt5-everywhere/qt5-everywhere.pro                        | 2 +-
 7 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'basicsuite/qt5-everywhere')

diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/content/ButtonPage.qml b/basicsuite/qt5-everywhere/demos/touchgallery/content/ButtonPage.qml
index 19c317f..9133158 100644
--- a/basicsuite/qt5-everywhere/demos/touchgallery/content/ButtonPage.qml
+++ b/basicsuite/qt5-everywhere/demos/touchgallery/content/ButtonPage.qml
@@ -97,7 +97,7 @@ Item {
         ButtonStyle {
             panel: Item {
                 implicitHeight: 50
-                implicitWidth: 320
+                implicitWidth: 300
                 BorderImage {
                     anchors.fill: parent
                     antialiasing: true
diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/content/ProgressBarPage.qml b/basicsuite/qt5-everywhere/demos/touchgallery/content/ProgressBarPage.qml
index d370d39..93adc7a 100644
--- a/basicsuite/qt5-everywhere/demos/touchgallery/content/ProgressBarPage.qml
+++ b/basicsuite/qt5-everywhere/demos/touchgallery/content/ProgressBarPage.qml
@@ -73,14 +73,14 @@ Item {
         ProgressBar {
             anchors.margins: 20
             style: touchStyle
-            width: 400
+            width: 300
             value: progress
         }
 
         ProgressBar {
             anchors.margins: 20
             style: touchStyle
-            width: 400
+            width: 300
             value: 1 - progress
         }
 
@@ -88,7 +88,7 @@ Item {
             anchors.margins: 20
             style: touchStyle
             value: 1
-            width: 400
+            width: 300
         }
 
     }
diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/content/SliderPage.qml b/basicsuite/qt5-everywhere/demos/touchgallery/content/SliderPage.qml
index 75a75fb..4a34037 100644
--- a/basicsuite/qt5-everywhere/demos/touchgallery/content/SliderPage.qml
+++ b/basicsuite/qt5-everywhere/demos/touchgallery/content/SliderPage.qml
@@ -53,16 +53,19 @@ Item {
 
         Slider {
             anchors.margins: 20
+            width: 280
             style: touchStyle
             value: 0
         }
         Slider {
             anchors.margins: 20
+            width: 280
             style: touchStyle
             value: 0.5
         }
         Slider {
             anchors.margins: 20
+            width: 280
             style: touchStyle
             value: 1.0
         }
diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/content/TabBarPage.qml b/basicsuite/qt5-everywhere/demos/touchgallery/content/TabBarPage.qml
index 8cba319..7731c33 100644
--- a/basicsuite/qt5-everywhere/demos/touchgallery/content/TabBarPage.qml
+++ b/basicsuite/qt5-everywhere/demos/touchgallery/content/TabBarPage.qml
@@ -84,7 +84,7 @@ Item {
                     Text {
                         anchors.centerIn: parent
                         color: "white"
-                        text: tab.title.toUpperCase()
+                        text: styleData.title
                         font.pixelSize: 16
                     }
                     Rectangle {
diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/content/TextInputPage.qml b/basicsuite/qt5-everywhere/demos/touchgallery/content/TextInputPage.qml
index 058ff53..0ed71f7 100644
--- a/basicsuite/qt5-everywhere/demos/touchgallery/content/TextInputPage.qml
+++ b/basicsuite/qt5-everywhere/demos/touchgallery/content/TextInputPage.qml
@@ -91,7 +91,7 @@ Item {
             font.pixelSize: 28
             background: Item {
                 implicitHeight: 50
-                implicitWidth: 320
+                implicitWidth: 300
                 BorderImage {
                     source: "../images/textinput.png"
                     border.left: 8
diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/main.qml b/basicsuite/qt5-everywhere/demos/touchgallery/main.qml
index 2708b8b..94089cf 100644
--- a/basicsuite/qt5-everywhere/demos/touchgallery/main.qml
+++ b/basicsuite/qt5-everywhere/demos/touchgallery/main.qml
@@ -81,9 +81,9 @@ CustomAppWindow {
         }
 
         Text {
-            font.pixelSize: app.height*.07
+            font.pixelSize: app.height*.06
             Behavior on x { NumberAnimation{ easing.type: Easing.OutCubic} }
-            x: backButton.x + backButton.width + 20
+            x: backButton.x + backButton.width + 10
             anchors.verticalCenter: parent.verticalCenter
             color: "white"
             text: "Widget Gallery"
diff --git a/basicsuite/qt5-everywhere/qt5-everywhere.pro b/basicsuite/qt5-everywhere/qt5-everywhere.pro
index fab62cb..245d838 100644
--- a/basicsuite/qt5-everywhere/qt5-everywhere.pro
+++ b/basicsuite/qt5-everywhere/qt5-everywhere.pro
@@ -2,4 +2,4 @@ TEMPLATE = subdirs
 CONFIG += ordered
 SUBDIRS += \
     demos \
-    app.pro
\ No newline at end of file
+    app.pro
-- 
cgit v1.2.3