summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/src/main/java/com/vaadin/client/ui/layout/VLayoutSlot.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/client/src/main/java/com/vaadin/client/ui/layout/VLayoutSlot.java b/client/src/main/java/com/vaadin/client/ui/layout/VLayoutSlot.java
index 1494900e62..4546d7c5d9 100644
--- a/client/src/main/java/com/vaadin/client/ui/layout/VLayoutSlot.java
+++ b/client/src/main/java/com/vaadin/client/ui/layout/VLayoutSlot.java
@@ -168,6 +168,7 @@ public abstract class VLayoutSlot {
int captionHeight;
VCaption caption = getCaption();
+ Style captionStyle = caption == null ? null : caption.getElement().getStyle();
if (caption == null || caption.shouldBePlacedAfterComponent()) {
style.clearPaddingTop();
captionHeight = 0;
@@ -215,10 +216,15 @@ public abstract class VLayoutSlot {
padding += captionHeight;
widget.getElement().getStyle().setTop(padding, Unit.PX);
+ if (captionStyle != null) {
+ captionStyle.setTop(padding - captionHeight, Unit.PX);
+ }
} else {
// Reset top when changing back to align top
widget.getElement().getStyle().clearTop();
-
+ if (captionStyle != null) {
+ captionStyle.setTop(0, Unit.PX);
+ }
}
}