From: Jouni Koivuviita <jouni.koivuviita@itmill.com>
Date: Wed, 31 Oct 2007 14:39:53 +0000 (+0000)
Subject: ISlider theme improved.
X-Git-Tag: 6.7.0.beta1~5738
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4a0d46afd52b8c3a7eb70596b02762982adba8c2;p=vaadin-framework.git

ISlider theme improved.

svn changeset:2638/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java
index e5532d5de9..9f090518c9 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java
@@ -271,13 +271,21 @@ public class ISlider extends Widget implements Paintable,
 		} else
 			DOM.setStyleAttribute(handle, styleAttribute, ((int) pos) + "px");
 
+		// Round value to resolution
+		if (resolution > 0) {
+			v = (int) (v * (double) Math.pow(10, resolution));
+			v = v / (double) Math.pow(10, resolution);
+		} else
+			v = Math.round(v);
+		
 		// TODO give more detailed info when dragging and do roundup
 		DOM.setElementAttribute(handle, "title", "" + v);
-
-		this.value = value;
+		
+		// Update value
+		this.value = new Double(v);
 
 		if (updateToServer)
-			client.updateVariable(id, "value", value.doubleValue(), immediate);
+			client.updateVariable(id, "value", this.value.doubleValue(), immediate);
 	}
 
 	public void onBrowserEvent(Event event) {
@@ -412,14 +420,6 @@ public class ISlider extends Widget implements Paintable,
 		else if (v > max)
 			v = max;
 
-		if (roundup) {
-			if (resolution > 0) {
-				v = (int) (v * (double) Math.pow(10, resolution));
-				v = v / (double) Math.pow(10, resolution);
-			} else
-				v = Math.round(v);
-		}
-
 		setValue(new Double(v), animate, roundup);
 	}
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/slider/img/handle-horizontal.png b/src/com/itmill/toolkit/terminal/gwt/public/default/slider/img/handle-horizontal.png
index a4fc19d5ad..620b86f1da 100755
Binary files a/src/com/itmill/toolkit/terminal/gwt/public/default/slider/img/handle-horizontal.png and b/src/com/itmill/toolkit/terminal/gwt/public/default/slider/img/handle-horizontal.png differ
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/slider/img/handle-vertical.png b/src/com/itmill/toolkit/terminal/gwt/public/default/slider/img/handle-vertical.png
index 280fff8fab..b7f63b91b7 100755
Binary files a/src/com/itmill/toolkit/terminal/gwt/public/default/slider/img/handle-vertical.png and b/src/com/itmill/toolkit/terminal/gwt/public/default/slider/img/handle-vertical.png differ
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/slider/slider.css b/src/com/itmill/toolkit/terminal/gwt/public/default/slider/slider.css
index fb9fb43e43..5b10e6a110 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/slider/slider.css
+++ b/src/com/itmill/toolkit/terminal/gwt/public/default/slider/slider.css
@@ -3,24 +3,27 @@
   --------------------------*/
 
 .i-slider {
-	border: 1px solid #d8dbdc;
-	height: 2px;
+	border: 1px solid #cccfd0;
+	height: 3px;
 	margin: 5px 0;
 }
 
 .i-slider-base {
-	height: 1px;
-	border-top: 1px solid #e5e8e8;
-	background: #fff;
+	height: 2px;
+	border-top: 1px solid #cbcdce;
+	background: #f3f3f4;
 }
 .i-slider-handle {
-	background: #babfc0 url(img/handle-horizontal.png);
-	width: 7px;
-	height: 15px;
+	background: transparent url(img/handle-horizontal.png);
+	width: 12px;
+	height: 12px;
 	margin-top: -5px;
 	font-size: 0;
 	cursor: pointer;
 }
+.i-slider-handle:hover {
+	background-position: left bottom;
+}
 /* TODO
 .i-slider-bigger {
 	background: #dde4ef url(img/arrow-right.png);
@@ -55,26 +58,44 @@
   -----------------*/
 
 .i-slider-vertical {
-	width: 2px;
+	width: 3px;
 	height: auto;
 	margin: 0 5px;
 }
 .i-slider-vertical .i-slider-base {
-	width: 1px;
-	border-left: 1px solid #e5e8e8;
-	background: #fff;
+	width: 2px;
+	border-left: 1px solid #cbcdce;
+	background: #f3f3f4;
 }
 .i-slider-vertical .i-slider-handle {
-	background: #babfc0 url(img/handle-vertical.png);
-	width: 14px;
-	height: 7px;
+	background: transparent url(img/handle-vertical.png);
+	width: 12px;
+	height: 12px;
 	font-size: 0;
 	cursor: pointer;
-	margin-left: -7px;
+	margin-left: -5px;
+}
+.i-slider-vertical .i-slider-handle:hover {
+	background-position: left bottom;
 }
 .i-slider-vertical .i-slider-bigger {
 
 }
 .i-slider-vertical .i-slider-smaller {
 
+}
+
+
+
+/* IE specific styles */
+
+* html .i-slider,
+* html .i-slider-vertical {
+	margin: 0;
+}
+* html .i-slider .i-slider-handle {
+	margin: -1px 0;
+}
+* html .i-slider-vertical .i-slider-handle {
+	margin: 0 -1px;
 }
\ No newline at end of file