diff options
| author | Jouni Koivuviita <jouni.koivuviita@itmill.com> | 2007-08-20 11:48:13 +0000 |
|---|---|---|
| committer | Jouni Koivuviita <jouni.koivuviita@itmill.com> | 2007-08-20 11:48:13 +0000 |
| commit | abe5b46235859a90ed7c1113fa4e35edd8753048 (patch) | |
| tree | e5e91daa96448df3b5faa0d7e6efa787a728e52c /src | |
| parent | f821f31dd9a65757f617be0788f163872903f382 (diff) | |
| download | vaadin-framework-abe5b46235859a90ed7c1113fa4e35edd8753048.tar.gz vaadin-framework-abe5b46235859a90ed7c1113fa4e35edd8753048.zip | |
Small changes to slider handle width calculation and value rounding to min/max values on overflow.
svn changeset:2066/svn branch:trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java | 9 |
1 files changed, 8 insertions, 1 deletions
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 94d176817b..458c65e6b7 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java @@ -179,7 +179,7 @@ public class ISlider extends Widget implements Paintable { int w = (int) (Double.parseDouble(DOM.getAttribute(base, "offsetWidth")) / 100 * handleSize);
if(handleSize == -1) {
int baseW = Integer.parseInt(DOM.getAttribute(base, "offsetWidth"));
- double range = (max - min) * (resolution+1) * 1.5;
+ double range = (max - min) * (resolution+1) * 3;
w = (int) (baseW - range);
}
if(w < 3)
@@ -203,6 +203,8 @@ public class ISlider extends Widget implements Paintable { double p = 0;
if(valueRange != 0)
p = range * ((v - min) / valueRange);
+ if(p < 0)
+ p = 0;
final double pos = p;
@@ -237,6 +239,11 @@ public class ISlider extends Widget implements Paintable { //DOM.setAttribute(handle, "title", ""+v);
}
+ if(value.doubleValue() < min)
+ value = new Double(min);
+ else if(value.doubleValue() > max)
+ value = new Double(max);
+
this.value = value;
if(updateToServer)
|