From 3eb9a9404544a7b954d18f19d373883d0623da93 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Tue, 19 May 2009 17:31:46 +1000
Subject: More precise positioning to leave 1-pixel inner margin

---
 demos/declarative/flickr/content/Progress.qml |  2 +-
 demos/declarative/flickr/content/Slider.qml   | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/demos/declarative/flickr/content/Progress.qml b/demos/declarative/flickr/content/Progress.qml
index 92a232e..aa2a2e6 100644
--- a/demos/declarative/flickr/content/Progress.qml
+++ b/demos/declarative/flickr/content/Progress.qml
@@ -5,7 +5,7 @@ Item {
 
     Rect {
         id: Container; anchors.fill: parent; gradientColor: "#66000000";
-        pen.color: "white"; pen.width: 1;  color: "#66343434"; radius: height/2 - 2
+        pen.color: "white"; pen.width: 0;  color: "#66343434"; radius: height/2 - 2
     }
 
     Rect {
diff --git a/demos/declarative/flickr/content/Slider.qml b/demos/declarative/flickr/content/Slider.qml
index 92f4993..aae4631 100644
--- a/demos/declarative/flickr/content/Slider.qml
+++ b/demos/declarative/flickr/content/Slider.qml
@@ -3,25 +3,25 @@ Item {
 
     // value is read/write.
     property real value
-    onValueChanged: { Handle.x = (value - minimum) * Slider.xMax / (maximum - minimum); }
+    onValueChanged: { Handle.x = 2 + (value - minimum) * Slider.xMax / (maximum - minimum); }
     property real maximum: 1
     property real minimum: 1
-    property int xMax: Slider.width - Handle.width - 2
+    property int xMax: Slider.width - Handle.width - 4
 
     Rect {
         id: Container; anchors.fill: parent; gradientColor: "#66000000";
-        pen.color: "white"; pen.width: 1;  color: "#66343434"; radius: 8
+        pen.color: "white"; pen.width: 0;  color: "#66343434"; radius: 8
     }
 
     Rect {
         id: Handle
-        x: Slider.width / 2 - Handle.width / 2; y: 2; width: 30; height: 12
+        x: Slider.width / 2 - Handle.width / 2; y: 2; width: 30; height: Slider.height-4
         color: "lightgray"; gradientColor: "gray"; radius: 6
 
         MouseRegion {
             anchors.fill: parent; drag.target: parent
-            drag.axis: "x"; drag.xmin: 2; drag.xmax: Slider.xMax
-            onPositionChanged: { value = (maximum - minimum) * Handle.x / Slider.xMax + minimum; }
+            drag.axis: "x"; drag.xmin: 2; drag.xmax: Slider.xMax+2
+            onPositionChanged: { value = (maximum - minimum) * (Handle.x-2) / Slider.xMax + minimum; }
         }
     }
 }
-- 
cgit v0.12