Grid deco elements are now resized appropriately (#16187)

Change-Id: Ibd33a7258188bd2ce6c203df0bff6053742a3f63

2 files changed, 40 insertions, 4 deletions

diff --git a/client/src/com/vaadin/client/widgets/Escalator.java b/client/src/com/vaadin/client/widgets/Escalator.java
index deaa9005c3..a4e3846196 100644
--- a/client/src/com/vaadin/client/widgets/Escalator.java
+++ b/client/src/com/vaadin/client/widgets/Escalator.java
@@ -64,7 +64,6 @@ import com.vaadin.client.widget.escalator.PositionFunction.AbsolutePosition;
 import com.vaadin.client.widget.escalator.PositionFunction.Translate3DPosition;
 import com.vaadin.client.widget.escalator.PositionFunction.TranslatePosition;
 import com.vaadin.client.widget.escalator.PositionFunction.WebkitTranslate3DPosition;
-import com.vaadin.client.widget.escalator.Row;
 import com.vaadin.client.widget.escalator.RowContainer;
 import com.vaadin.client.widget.escalator.RowVisibilityChangeEvent;
 import com.vaadin.client.widget.escalator.RowVisibilityChangeHandler;
@@ -2184,6 +2183,7 @@ public class Escalator extends Widget implements RequiresResize, DeferredWorker
             bodyElem.getStyle().setMarginTop(heightOfSection, Unit.PX);
             verticalScrollbar.getElement().getStyle()
                     .setTop(heightOfSection, Unit.PX);
+            headerDeco.getStyle().setHeight(heightOfSection, Unit.PX);
         }
 
         @Override
@@ -2225,6 +2225,8 @@ public class Escalator extends Widget implements RequiresResize, DeferredWorker
                 vscrollHeight -= horizontalScrollbar.getScrollbarThickness();
             }
 
+            footerDeco.getStyle().setHeight(footer.heightOfSection, Unit.PX);
+
             verticalScrollbar.setOffsetSize(vscrollHeight);
         }
     }
@@ -4730,9 +4732,6 @@ public class Escalator extends Widget implements RequiresResize, DeferredWorker
         body.recalculateSectionHeight();
         footer.recalculateSectionHeight();
 
-        headerDeco.getStyle().setHeight(header.heightOfSection, Unit.PX);
-        footerDeco.getStyle().setHeight(footer.heightOfSection, Unit.PX);
-
         scroller.recalculateScrollbarsForVirtualViewport();
         body.verifyEscalatorCount();
         Profiler.leave("Escalator.recalculateElementSizes");
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridClientStructureTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridClientStructureTest.java
new file mode 100644
index 0000000000..74cf368da9
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridClientStructureTest.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.tests.components.grid.basicfeatures.client;
+
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.tests.components.grid.basicfeatures.GridBasicClientFeaturesTest;
+
+@SuppressWarnings("all")
+public class GridClientStructureTest extends GridBasicClientFeaturesTest {
+    @Test
+    public void haederDecoSizeShouldBeRecalculated() {
+        // it's easier to notice with valo
+        openTestURL("theme=valo");
+
+        WebElement topDeco = getGridElement().findElement(
+                By.className("v-grid-header-deco"));
+        assertGreater(
+                "The header deco in Valo hasn't been recalculated after initial rendering",
+                topDeco.getSize().getHeight(), 20);
+    }
+}