Modified default sizes of different controls.

Also modified background color of touch example.

diff --git a/examples/touch/content/ProgressBarPage.qml b/examples/touch/content/ProgressBarPage.qml
index a53d904..faae764 100644 (file)
--- a/examples/touch/content/ProgressBarPage.qml
+++ b/examples/touch/content/ProgressBarPage.qml
@@ -72,23 +72,17 @@ Item {
 
         ProgressBar {
             anchors.margins: 20
-            //style: touchStyle
-            width: 400
             value: progress
         }
 
         ProgressBar {
             anchors.margins: 20
-            //style: touchStyle
-            width: 400
             value: 1 - progress
         }
 
         ProgressBar {
             anchors.margins: 20
-            //style: touchStyle
             value: 1
-            width: 400
         }
 
     }

diff --git a/examples/touch/main.qml b/examples/touch/main.qml
index 5653880..9d6678c 100644 (file)
--- a/examples/touch/main.qml
+++ b/examples/touch/main.qml
@@ -47,7 +47,7 @@ ApplicationWindow {
     height: 1280
 
     Rectangle {
-        color: Qt.lighter("lightgrey")
+        color: "#F8F6EF"
         anchors.fill: parent
     }
 

diff --git a/src/styles/ButtonStyle.qml b/src/styles/ButtonStyle.qml
index 66dd0f2..cd9ab8d 100644 (file)
--- a/src/styles/ButtonStyle.qml
+++ b/src/styles/ButtonStyle.qml
@@ -26,8 +26,8 @@ ButtonStyle {
     id: buttonstyle
 
     background: TizenBorderImage {
-        implicitWidth: 300
-        implicitHeight: 50
+        implicitWidth: 400
+        implicitHeight: 80
         source: control.enabled ? (control.pressed ? Default.button.source.pressed: Default.button.source.normal) : Default.button.source.disabled
         effectSource: control.enabled ? (control.pressed ? Default.button.effectSource.pressed: Default.button.effectSource.normal) : Default.button.effectSource.disabled
         backgroundColor: control.enabled ? (control.pressed ? Default.button.backgroundColor.pressed: Default.button.backgroundColor.normal) : Default.button.backgroundColor.disabled

diff --git a/src/styles/ProgressBarStyle.qml b/src/styles/ProgressBarStyle.qml
index 4a46ee1..caaed68 100644 (file)
--- a/src/styles/ProgressBarStyle.qml
+++ b/src/styles/ProgressBarStyle.qml
@@ -41,8 +41,9 @@ ProgressBarStyle {
     }
 
     background: Item {
-        implicitHeight: bg.implicitHeight
-        implicitWidth: bg.implicitWidth
+        implicitHeight: 36
+        implicitWidth: 650
+
         TizenBorderImage {
             id:bg
             anchors.centerIn: parent

diff --git a/src/styles/SliderStyle.qml b/src/styles/SliderStyle.qml
index 06a7482..f0c0251 100644 (file)
--- a/src/styles/SliderStyle.qml
+++ b/src/styles/SliderStyle.qml
@@ -28,6 +28,7 @@ SliderStyle {
         id:handleItem
         implicitWidth: bg.implicitWidth
         implicitHeight: bg.implicitHeight
+
         property int globalX:updatePos(control.value).x
         property int globalY:updatePos(control.value).y
         function updatePos(value) {
@@ -101,7 +102,7 @@ SliderStyle {
     */
     groove: Item {
         implicitHeight: 36
-        implicitWidth: 400
+        implicitWidth: 650
         ProgressBar {
             anchors.fill: parent
             value: control.value