VerticalLayout has spacing = true and margin = true by default .

HorizontalLayout has spacing = true and margin = false by default.

Fixes vaadin/framework8-issues#526

server/src/main/java/com/vaadin/ui/AbstractLayout.java

@@ -105,7 +105,7 @@ protected MarginInfo readMargin(Element design, MarginInfo defMargin,
      */
     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);

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);
     }
 
     /**

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 LegacyWindow() {
      *            the caption of the window
      */
     public LegacyWindow(String caption) {
-        super(new VerticalLayout());
-        ((VerticalLayout) getContent()).setMargin(true);
+        this();
         setCaption(caption);
     }
 

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);
     }
 
     /**

server/src/test/java/com/vaadin/tests/server/component/DeclarativeMarginTestBase.java

@@ -25,7 +25,7 @@
 public abstract class DeclarativeMarginTestBase<L extends Layout & MarginHandler>
         extends DeclarativeTestBase<L> {
 
-    protected void testMargins(String componentTag) {
+    protected void testMargins(String componentTag, boolean defaultMargin) {
 
         for (int i = 0; i < 16; ++i) {
             boolean top = (i & 1) == 1;
@@ -35,37 +35,41 @@ protected void testMargins(String componentTag) {
 
             MarginInfo m = new MarginInfo(top, right, bottom, left);
 
-            String design = getMarginTag(componentTag, top, right, bottom,
+            String design = getMarginTag(componentTag, defaultMargin, top, right, bottom,
                     left);
 
             // The assertEquals machinery in DeclarativeTestBase uses bean
             // introspection and MarginInfo is not a proper bean. It ends up
             // considering *all* MarginInfo objects equal... (#18229)
             L layout = read(design);
-            Assert.assertEquals(m, layout.getMargin());
+            Assert.assertEquals("For tag: " + design, m, layout.getMargin());
 
             testWrite(design, layout);
         }
     }
 
-    private String getMarginTag(String componentTag, boolean top, boolean right,
-            boolean bottom, boolean left) {
+    private String getMarginTag(String componentTag, boolean defaultMargin, boolean top, boolean right,
+                                boolean bottom, boolean left) {
         String s = "<" + componentTag + " ";
+        String suffix = defaultMargin ? "=false " : " ";
 
-        if (left && right && top && bottom) {
-            s += "margin";
+        if (top == left && top == right && top == bottom) {
+            if(top != defaultMargin)
+            {
+                s += "margin" + suffix;
+            }
         } else {
-            if (left) {
-                s += "margin-left ";
+            if (left != defaultMargin) {
+                s += "margin-left" + suffix;
             }
-            if (right) {
-                s += "margin-right ";
+            if (right != defaultMargin) {
+                s += "margin-right" + suffix;
             }
-            if (top) {
-                s += "margin-top ";
+            if (top != defaultMargin) {
+                s += "margin-top" + suffix;
             }
-            if (bottom) {
-                s += "margin-bottom ";
+            if (bottom != defaultMargin) {
+                s += "margin-bottom" + suffix;
             }
         }
         return s + " />";

server/src/test/java/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutDeclarativeTest.java

@@ -18,6 +18,7 @@
 import java.util.Arrays;
 import java.util.List;
 
+import org.junit.Ignore;
 import org.junit.Test;
 
 import com.vaadin.shared.ui.label.ContentMode;
@@ -40,8 +41,13 @@ public class AbstractOrderedLayoutDeclarativeTest
     private List<String> defaultAlignments = Arrays.asList(":top", ":left");
 
     @Test
-    public void testMargins() {
-        testMargins("vaadin-vertical-layout");
+    public void testMarginsVertical() {
+        testMargins("vaadin-vertical-layout", true);
+    }
+
+    @Test
+    public void testMarginsHorizontal() {
+        testMargins("vaadin-horizontal-layout", false);
     }
 
     @Test

server/src/test/java/com/vaadin/tests/server/component/gridlayout/GridLayoutDeclarativeTest.java

@@ -38,7 +38,7 @@ public class GridLayoutDeclarativeTest
 
     @Test
     public void testMargins() {
-        testMargins("vaadin-grid-layout");
+        testMargins("vaadin-grid-layout",false);
     }
 
     @Test

shared/src/main/java/com/vaadin/shared/ui/MarginInfo.java

@@ -148,6 +148,17 @@ public boolean hasAll() {
         return (bitMask & ALL) == ALL;
     }
 
+    /**
+     * Checks if this MarginInfo object has no margins enabled.
+     *
+     * @since 8.0.0
+     *
+     * @return true if all edges have margins disabled
+     */
+    public boolean hasNone() {
+        return (bitMask & ALL) == 0;
+    }
+
     /**
      * Checks if this MarginInfo object has the left edge margin enabled.
      *

uitest/src/main/java/com/vaadin/tests/components/AbstractTestUI.java

@@ -29,10 +29,12 @@ public void init(VaadinRequest request) {
         label.setWidth("100%");
 
         VerticalLayout rootLayout = new VerticalLayout();
-        rootLayout.setMargin(true);
+        rootLayout.setSpacing(false);
         setContent(rootLayout);
 
         layout = new VerticalLayout();
+        layout.setSpacing(false);
+        layout.setMargin(false);
 
         rootLayout.addComponent(label);
         rootLayout.addComponent(layout);

uitest/src/main/java/com/vaadin/tests/components/TestBase.java

@@ -39,6 +39,8 @@ && getBrowser().getBrowserMajorVersion() == 9) {
         window.addComponent(label);
 
         layout = new VerticalLayout();
+        layout.setMargin(false);
+        layout.setSpacing(false);
         window.addComponent(layout);
         ((VerticalLayout) window.getContent()).setExpandRatio(layout, 1);
 

uitest/src/main/java/com/vaadin/tests/components/browserframe/BrowserFrameIsVisible.java

@@ -17,6 +17,7 @@ public class BrowserFrameIsVisible extends TestBase {
     protected void setup() {
 
         HorizontalLayout buttonLayout = new HorizontalLayout();
+        buttonLayout.setSpacing(false);
         addComponent(buttonLayout);
 
         Button page1 = new Button("Hello World");

uitest/src/main/java/com/vaadin/tests/components/customfield/CustomFieldSize.java

@@ -32,6 +32,8 @@ public class CustomFieldSize extends AbstractReindeerTestUI {
     @Override
     protected void setup(VaadinRequest request) {
         VerticalLayout layout = new VerticalLayout();
+        layout.setMargin(false);
+        layout.setSpacing(false);
         setContent(layout);
         layout.setWidth("50px");
 

uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragStartModes.java

@@ -29,7 +29,7 @@ protected void setup() {
     private Component makeOtherComponentWrapper(DragStartMode componentOther) {
         VerticalLayout parent = new VerticalLayout();
         parent.setWidth("200px");
-        parent.setSpacing(true);
+        parent.setMargin(false);
 
         CssLayout header = new CssLayout();
         Label dragStartModeLabel = new Label(

uitest/src/main/java/com/vaadin/tests/components/grid/InitiallyDisabledGrid.java

@@ -15,6 +15,8 @@ public class InitiallyDisabledGrid extends UI {
     @Override
     protected void init(VaadinRequest request) {
         VerticalLayout layout = new VerticalLayout();
+        layout.setMargin(false);
+        layout.setSpacing(false);
         setContent(layout);
         layout.setSizeFull();
         layout.setWidth("600px");
@@ -25,6 +27,8 @@ protected void init(VaadinRequest request) {
 
         layout.addComponent(button);
         VerticalLayout l = new VerticalLayout();
+        l.setMargin(false);
+        l.setSpacing(false);
         l.setSizeFull();
         l.addComponent(grid);
 

uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutRequiredIndicatorLocation.java

@@ -68,6 +68,8 @@ protected void setup(VaadinRequest request) {
 
     private VerticalLayout createVerticalLayout(boolean useCaption) {
         VerticalLayout vl = new VerticalLayout();
+        vl.setMargin(false);
+        vl.setSpacing(false);
         vl.setWidth("320px");
 
         addLabel(vl, "200px", Alignment.MIDDLE_LEFT, useCaption);

uitest/src/main/java/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java

@@ -2,9 +2,9 @@
 
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractReindeerTestUI;
+import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.ComponentContainer;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
@@ -13,7 +13,7 @@ public class MoveComponentsFromGridLayoutToInnerLayout extends AbstractReindeerT
 
     protected Button testButton;
     private GridLayout gl;
-    protected ComponentContainer vl;
+    protected AbstractOrderedLayout vl;
 
     @Override
     protected void setup(VaadinRequest request) {
@@ -34,6 +34,8 @@ public void buttonClick(ClickEvent event) {
         gl.addComponent(testButton);
 
         vl = new VerticalLayout();
+        vl.setMargin(false);
+        vl.setSpacing(false);
         vl.addComponent(new Label("I'm inside the inner layout"));
         gl.addComponent(vl);
 

uitest/src/main/java/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponent.java

@@ -34,7 +34,7 @@ protected void setup(VaadinRequest request) {
         VerticalLayout container = new VerticalLayout();
         container.setStyleName("mystyle");
         container.setId("container");
-        container.setSpacing(true);
+        container.setMargin(false);
         container.setSizeFull();
         addComponent(container);
 

uitest/src/main/java/com/vaadin/tests/components/panel/UndefinedSizeScrollbars.java

@@ -29,7 +29,7 @@ public class UndefinedSizeScrollbars extends AbstractReindeerTestUI {
     @Override
     protected void setup(VaadinRequest request) {
         VerticalLayout layout = new VerticalLayout();
-        layout.setSpacing(true);
+        layout.setMargin(false);
         layout.setSizeFull();
         setContent(layout);
 

uitest/src/main/java/com/vaadin/tests/components/slider/SliderResize.java

@@ -27,7 +27,7 @@ public class SliderResize extends AbstractReindeerTestUI {
     @Override
     protected void setup(VaadinRequest request) {
         final VerticalLayout layout = new VerticalLayout();
-        layout.setSpacing(true);
+        layout.setMargin(false);
         layout.setWidth("500px");
         addComponent(layout);