]> source.dussan.org Git - vaadin-framework.git/commitdiff
Small changes to slider handle width calculation and value rounding to min/max values...
authorJouni Koivuviita <jouni.koivuviita@itmill.com>
Mon, 20 Aug 2007 11:48:13 +0000 (11:48 +0000)
committerJouni Koivuviita <jouni.koivuviita@itmill.com>
Mon, 20 Aug 2007 11:48:13 +0000 (11:48 +0000)
svn changeset:2066/svn branch:trunk

src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java

index 94d176817b9a481982971b9a763c3a7b623deed8..458c65e6b79329662bdf4a4e54f96c79836ddff4 100644 (file)
@@ -179,7 +179,7 @@ public class ISlider extends Widget implements Paintable {
                        int w = (int) (Double.parseDouble(DOM.getAttribute(base, "offsetWidth")) / 100 * handleSize);\r
                        if(handleSize == -1) {\r
                                int baseW = Integer.parseInt(DOM.getAttribute(base, "offsetWidth"));\r
-                               double range = (max - min) * (resolution+1) * 1.5;\r
+                               double range = (max - min) * (resolution+1) * 3;\r
                                w = (int) (baseW - range);\r
                        }\r
                        if(w < 3)\r
@@ -203,6 +203,8 @@ public class ISlider extends Widget implements Paintable {
                        double p = 0;\r
                        if(valueRange != 0)\r
                                p = range * ((v - min) / valueRange);\r
+                       if(p < 0)\r
+                               p = 0;\r
                        final double pos = p;\r
                                \r
                        \r
@@ -237,6 +239,11 @@ public class ISlider extends Widget implements Paintable {
                        //DOM.setAttribute(handle, "title", ""+v);\r
                }\r
                \r
+               if(value.doubleValue() < min)\r
+                       value = new Double(min);\r
+               else if(value.doubleValue() > max)\r
+                       value = new Double(max);\r
+               \r
                this.value = value;\r
                \r
                if(updateToServer)\r