Merge commit 'edf451'

Conflicts:
	src/com/vaadin/terminal/gwt/client/ui/slider/VSlider.java

1 files changed, 12 insertions, 0 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ui/slider/VSlider.java b/src/com/vaadin/terminal/gwt/client/ui/slider/VSlider.java
index 9ff614252d..aac0920f66 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/slider/VSlider.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/slider/VSlider.java
@@ -77,6 +77,7 @@ public class VSlider extends SimpleFocusablePanel implements Field,
     private VLazyExecutor delayedValueUpdater = new VLazyExecutor(100,
             new ScheduledCommand() {
 
+                @Override
                 public void execute() {
                     updateValueToServer();
                     acceleration = 1;
@@ -139,8 +140,12 @@ public class VSlider extends SimpleFocusablePanel implements Field,
 
     void buildBase() {
         final String styleAttribute = vertical ? "height" : "width";
+        final String oppositeStyleAttribute = vertical ? "width" : "height";
         final String domProperty = vertical ? "offsetHeight" : "offsetWidth";
 
+        // clear unnecessary opposite style attribute
+        DOM.setStyleAttribute(base, oppositeStyleAttribute, "");
+
         final Element p = DOM.getParent(getElement());
         if (DOM.getElementPropertyInt(p, domProperty) > 50) {
             if (vertical) {
@@ -153,6 +158,7 @@ public class VSlider extends SimpleFocusablePanel implements Field,
             // (supposedly) been drawn completely.
             DOM.setStyleAttribute(base, styleAttribute, MIN_SIZE + "px");
             Scheduler.get().scheduleDeferred(new Command() {
+                @Override
                 public void execute() {
                     final Element p = DOM.getParent(getElement());
                     if (DOM.getElementPropertyInt(p, domProperty) > (MIN_SIZE + 5)) {
@@ -173,9 +179,14 @@ public class VSlider extends SimpleFocusablePanel implements Field,
 
     void buildHandle() {
         final String handleAttribute = vertical ? "marginTop" : "marginLeft";
+        final String oppositeHandleAttribute = vertical ? "marginLeft"
+                : "marginTop";
 
         DOM.setStyleAttribute(handle, handleAttribute, "0");
 
+        // clear unnecessary opposite handle attribute
+        DOM.setStyleAttribute(handle, oppositeHandleAttribute, "");
+
         // Restore visibility
         DOM.setStyleAttribute(handle, "visibility", "visible");
 
@@ -405,6 +416,7 @@ public class VSlider extends SimpleFocusablePanel implements Field,
         }
     }
 
+    @Override
     public void iLayout() {
         if (vertical) {
             setHeight();