summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2015-09-01 21:45:50 +0300
committerVaadin Code Review <review@vaadin.com>2015-09-29 05:46:17 +0000
commitfc2ef4bdc853ae67f245a77252958c43c0b9dce8 (patch)
tree9d36de0ba88db175cca19a307d33ae19e56b81e2 /client
parentf2a3d4d570e345a7505656ad77799ee5b4d14385 (diff)
downloadvaadin-framework-fc2ef4bdc853ae67f245a77252958c43c0b9dce8.tar.gz
vaadin-framework-fc2ef4bdc853ae67f245a77252958c43c0b9dce8.zip
Fix resetting of top or left alignment in GridLayout (#18660)
Change-Id: I12b4d792f4d7cc7e3340d5566fda55f0cb23cbd0
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/client/ui/layout/VLayoutSlot.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/client/src/com/vaadin/client/ui/layout/VLayoutSlot.java b/client/src/com/vaadin/client/ui/layout/VLayoutSlot.java
index f308d07673..bc0c6739bb 100644
--- a/client/src/com/vaadin/client/ui/layout/VLayoutSlot.java
+++ b/client/src/com/vaadin/client/ui/layout/VLayoutSlot.java
@@ -149,6 +149,8 @@ public abstract class VLayoutSlot {
if (captionAboveCompnent) {
captionStyle.setLeft(0, Unit.PX);
}
+ // Reset left when changing back to align left
+ widget.getElement().getStyle().clearLeft();
}
}
@@ -212,6 +214,10 @@ public abstract class VLayoutSlot {
padding += captionHeight;
widget.getElement().getStyle().setTop(padding, Unit.PX);
+ } else {
+ // Reset top when changing back to align top
+ widget.getElement().getStyle().clearTop();
+
}
}