diff options
Diffstat (limited to 'server/src/main/java')
4 files changed, 6 insertions, 5 deletions
diff --git a/server/src/main/java/com/vaadin/ui/AbstractLayout.java b/server/src/main/java/com/vaadin/ui/AbstractLayout.java index d4f8042355..fe073eb687 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractLayout.java +++ b/server/src/main/java/com/vaadin/ui/AbstractLayout.java @@ -105,7 +105,7 @@ public abstract class AbstractLayout extends AbstractComponentContainer */ protected void writeMargin(Element design, MarginInfo margin, MarginInfo defMargin, DesignContext context) { - if (margin.hasAll()) { + if (margin.hasAll() || margin.hasNone()) { DesignAttributeHandler.writeAttribute("margin", design.attributes(), margin.hasAll(), defMargin.hasAll(), boolean.class, context); diff --git a/server/src/main/java/com/vaadin/ui/HorizontalLayout.java b/server/src/main/java/com/vaadin/ui/HorizontalLayout.java index 4682937ff5..07583c6712 100644 --- a/server/src/main/java/com/vaadin/ui/HorizontalLayout.java +++ b/server/src/main/java/com/vaadin/ui/HorizontalLayout.java @@ -33,7 +33,7 @@ public class HorizontalLayout extends AbstractOrderedLayout { * Constructs an empty HorizontalLayout. */ public HorizontalLayout() { - + setSpacing(true); } /** diff --git a/server/src/main/java/com/vaadin/ui/LegacyWindow.java b/server/src/main/java/com/vaadin/ui/LegacyWindow.java index 2705d56486..dda734899d 100644 --- a/server/src/main/java/com/vaadin/ui/LegacyWindow.java +++ b/server/src/main/java/com/vaadin/ui/LegacyWindow.java @@ -40,7 +40,7 @@ public class LegacyWindow extends UI { */ public LegacyWindow() { super(new VerticalLayout()); - ((VerticalLayout) getContent()).setMargin(true); + ((VerticalLayout) getContent()).setSpacing(false); } /** @@ -50,8 +50,7 @@ public class LegacyWindow extends UI { * the caption of the window */ public LegacyWindow(String caption) { - super(new VerticalLayout()); - ((VerticalLayout) getContent()).setMargin(true); + this(); setCaption(caption); } diff --git a/server/src/main/java/com/vaadin/ui/VerticalLayout.java b/server/src/main/java/com/vaadin/ui/VerticalLayout.java index 7fcf6d438a..d441e8a664 100644 --- a/server/src/main/java/com/vaadin/ui/VerticalLayout.java +++ b/server/src/main/java/com/vaadin/ui/VerticalLayout.java @@ -35,6 +35,8 @@ public class VerticalLayout extends AbstractOrderedLayout { */ public VerticalLayout() { setWidth("100%"); + setSpacing(true); + setMargin(true); } /** |