From 6178748a6ea34df40a8e3c9ce67137e33383bb0e Mon Sep 17 00:00:00 2001
From: Gatis Paeglis <gatis.paeglis@digia.com>
Date: Wed, 10 Sep 2014 11:50:27 +0200
Subject: Fix layout issues in touchgallery.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I2062a655e383ab2dd09619e070037c637d273d55
Reviewed-by: Lasse Räihä <lasse.raiha@digia.com>
---
 QtDemo/qml/QtDemo/demos/touchgallery/content/ButtonPage.qml    |  6 +-----
 .../qml/QtDemo/demos/touchgallery/content/ProgressBarPage.qml  | 10 +++-------
 QtDemo/qml/QtDemo/demos/touchgallery/content/SliderPage.qml    |  3 +++
 QtDemo/qml/QtDemo/demos/touchgallery/content/TabBarPage.qml    |  6 +-----
 QtDemo/qml/QtDemo/demos/touchgallery/content/TextInputPage.qml |  6 +-----
 QtDemo/qml/QtDemo/demos/touchgallery/main.qml                  |  3 +--
 6 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/QtDemo/qml/QtDemo/demos/touchgallery/content/ButtonPage.qml b/QtDemo/qml/QtDemo/demos/touchgallery/content/ButtonPage.qml
index 63f9646..10e4d0d 100644
--- a/QtDemo/qml/QtDemo/demos/touchgallery/content/ButtonPage.qml
+++ b/QtDemo/qml/QtDemo/demos/touchgallery/content/ButtonPage.qml
@@ -38,10 +38,6 @@
 **
 ****************************************************************************/
 
-
-
-
-
 import QtQuick 2.1
 import QtQuick.Controls 1.0
 import QtQuick.Controls.Styles 1.0
@@ -97,7 +93,7 @@ Item {
         ButtonStyle {
             panel: Item {
                 implicitHeight: 50
-                implicitWidth: 320
+                implicitWidth: 300
                 BorderImage {
                     anchors.fill: parent
                     antialiasing: true
diff --git a/QtDemo/qml/QtDemo/demos/touchgallery/content/ProgressBarPage.qml b/QtDemo/qml/QtDemo/demos/touchgallery/content/ProgressBarPage.qml
index dc0f552..5930812 100644
--- a/QtDemo/qml/QtDemo/demos/touchgallery/content/ProgressBarPage.qml
+++ b/QtDemo/qml/QtDemo/demos/touchgallery/content/ProgressBarPage.qml
@@ -38,10 +38,6 @@
 **
 ****************************************************************************/
 
-
-
-
-
 import QtQuick 2.1
 import QtQuick.Controls 1.0
 import QtQuick.Controls.Styles 1.0
@@ -73,14 +69,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 +84,7 @@ Item {
             anchors.margins: 20
             style: touchStyle
             value: 1
-            width: 400
+            width: 300
         }
 
     }
diff --git a/QtDemo/qml/QtDemo/demos/touchgallery/content/SliderPage.qml b/QtDemo/qml/QtDemo/demos/touchgallery/content/SliderPage.qml
index a1c0045..0844a0e 100644
--- a/QtDemo/qml/QtDemo/demos/touchgallery/content/SliderPage.qml
+++ b/QtDemo/qml/QtDemo/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/QtDemo/qml/QtDemo/demos/touchgallery/content/TabBarPage.qml b/QtDemo/qml/QtDemo/demos/touchgallery/content/TabBarPage.qml
index 7651a3c..d722bb6 100644
--- a/QtDemo/qml/QtDemo/demos/touchgallery/content/TabBarPage.qml
+++ b/QtDemo/qml/QtDemo/demos/touchgallery/content/TabBarPage.qml
@@ -38,10 +38,6 @@
 **
 ****************************************************************************/
 
-
-
-
-
 import QtQuick 2.1
 import QtQuick.Controls 1.0
 import QtQuick.Controls.Styles 1.0
@@ -84,7 +80,7 @@ Item {
                     Text {
                         anchors.centerIn: parent
                         color: "white"
-                        text: styleData.title.toUpperCase()
+                        text: styleData.title
                         font.pixelSize: 16
                     }
                     Rectangle {
diff --git a/QtDemo/qml/QtDemo/demos/touchgallery/content/TextInputPage.qml b/QtDemo/qml/QtDemo/demos/touchgallery/content/TextInputPage.qml
index 605afef..2f841ce 100644
--- a/QtDemo/qml/QtDemo/demos/touchgallery/content/TextInputPage.qml
+++ b/QtDemo/qml/QtDemo/demos/touchgallery/content/TextInputPage.qml
@@ -38,10 +38,6 @@
 **
 ****************************************************************************/
 
-
-
-
-
 import QtQuick 2.1
 import QtQuick.Controls 1.0
 import QtQuick.Controls.Styles 1.0
@@ -91,7 +87,7 @@ Item {
             font.pixelSize: 28
             background: Item {
                 implicitHeight: 50
-                implicitWidth: 320
+                implicitWidth: 300
                 BorderImage {
                     source: "../images/textinput.png"
                     border.left: 8
diff --git a/QtDemo/qml/QtDemo/demos/touchgallery/main.qml b/QtDemo/qml/QtDemo/demos/touchgallery/main.qml
index ad8fbef..ce42058 100644
--- a/QtDemo/qml/QtDemo/demos/touchgallery/main.qml
+++ b/QtDemo/qml/QtDemo/demos/touchgallery/main.qml
@@ -38,7 +38,6 @@
 **
 ****************************************************************************/
 
-
 import QtQuick 2.1
 import QtQuick.Controls 1.0
 import "content"
@@ -83,7 +82,7 @@ CustomAppWindow {
         Text {
             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"
-- 
cgit v1.2.3