From f82f4d59015209feae98743bc27744a81ded89b8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Leif=20=C3=85strand?= Date: Thu, 16 Feb 2012 18:58:15 +0200 Subject: [PATCH] Set a style name for the layout slot and add overflow: hidden (#8313) --- .../VAADIN/themes/base/orderedlayout/orderedlayout.css | 5 +++++ .../gwt/client/ui/VMeasuringOrderedLayoutPaintable.java | 3 ++- .../vaadin/terminal/gwt/client/ui/layout/VLayoutSlot.java | 4 ++-- .../terminal/gwt/client/ui/layout/VPaintableLayoutSlot.java | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css b/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css index ef8c15ac1e..83fcc0b84f 100644 --- a/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css +++ b/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css @@ -38,3 +38,8 @@ padding-top: 0; padding-left: 0; } + +.v-horizontallayout-slot, .v-verticallayout-slot { + position: absolute; + overflow: hidden; +} diff --git a/src/com/vaadin/terminal/gwt/client/ui/VMeasuringOrderedLayoutPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/VMeasuringOrderedLayoutPaintable.java index 0583be5ada..e142f31ffe 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VMeasuringOrderedLayoutPaintable.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VMeasuringOrderedLayoutPaintable.java @@ -72,7 +72,8 @@ public abstract class VMeasuringOrderedLayoutPaintable extends VLayoutSlot slot = layout.getSlotForChild(widget); if (widget.getParent() != layout) { - slot = new VPaintableLayoutSlot(child); + slot = new VPaintableLayoutSlot(getWidgetForPaintable() + .getStylePrimaryName(), child); layout.addSlot(slot); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/layout/VLayoutSlot.java b/src/com/vaadin/terminal/gwt/client/ui/layout/VLayoutSlot.java index d14ab2b90e..f5ec7826c3 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/layout/VLayoutSlot.java +++ b/src/com/vaadin/terminal/gwt/client/ui/layout/VLayoutSlot.java @@ -20,10 +20,10 @@ public abstract class VLayoutSlot { private double expandRatio; - public VLayoutSlot(Widget widget) { + public VLayoutSlot(String baseClassName, Widget widget) { this.widget = widget; - wrapper.getStyle().setPosition(Position.ABSOLUTE); + wrapper.setClassName(baseClassName + "-slot"); } public VCaption getCaption() { diff --git a/src/com/vaadin/terminal/gwt/client/ui/layout/VPaintableLayoutSlot.java b/src/com/vaadin/terminal/gwt/client/ui/layout/VPaintableLayoutSlot.java index 17afab0fe8..e309de7c4b 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/layout/VPaintableLayoutSlot.java +++ b/src/com/vaadin/terminal/gwt/client/ui/layout/VPaintableLayoutSlot.java @@ -8,8 +8,8 @@ public class VPaintableLayoutSlot extends VLayoutSlot { final VPaintableWidget paintable; - public VPaintableLayoutSlot(VPaintableWidget paintable) { - super(paintable.getWidgetForPaintable()); + public VPaintableLayoutSlot(String baseClassName, VPaintableWidget paintable) { + super(baseClassName, paintable.getWidgetForPaintable()); this.paintable = paintable; } -- 2.39.5