From dd550858b9b4300acac8e35159f4c93e7f58d8ed Mon Sep 17 00:00:00 2001
From: Pekka Hyvönen <pekka@vaadin.com>
Date: Tue, 14 Apr 2015 15:39:18 +0300
Subject: Calculate Grid sidebar button height when closed #17412

+ contains Valo theming fixes for all browsers.
+ includes screenshot test for sidebar in Valo

Change-Id: Ic6401057efff7e4d4ab65c46885dda2d995bce5d
---
 client/src/com/vaadin/client/widgets/Grid.java | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'client/src')

diff --git a/client/src/com/vaadin/client/widgets/Grid.java b/client/src/com/vaadin/client/widgets/Grid.java
index f45d8ef3b4..220e83257b 100644
--- a/client/src/com/vaadin/client/widgets/Grid.java
+++ b/client/src/com/vaadin/client/widgets/Grid.java
@@ -3080,6 +3080,7 @@ public class Grid<T> extends ResizeComposite implements
                 removeStyleName("closed");
                 rootContainer.add(content);
             }
+            openCloseButton.setHeight("");
         }
 
         /**
@@ -3090,6 +3091,8 @@ public class Grid<T> extends ResizeComposite implements
                 removeStyleName("opened");
                 addStyleName("closed");
                 content.removeFromParent();
+                // adjust open button to header height when closed
+                setHeightToHeaderCellHeight();
             }
         }
 
@@ -3156,6 +3159,23 @@ public class Grid<T> extends ResizeComposite implements
             }
         }
 
+        private void setHeightToHeaderCellHeight() {
+            try {
+                double height = WidgetUtil
+                        .getRequiredHeightBoundingClientRectDouble(grid.escalator
+                                .getHeader().getRowElement(0)
+                                .getFirstChildElement())
+                        - (WidgetUtil.measureVerticalBorder(getElement()) / 2);
+                openCloseButton.setHeight(height + "px");
+            } catch (NullPointerException npe) {
+                getLogger()
+                        .warning(
+                                "Got null header first row or first row cell when calculating sidebar button height");
+                openCloseButton.setHeight(grid.escalator.getHeader()
+                        .getDefaultRowHeight() + "px");
+            }
+        }
+
         private void updateVisibility() {
             final boolean hasWidgets = content.getWidgetCount() > 0;
             final boolean isVisible = isInDOM();
@@ -3166,6 +3186,8 @@ public class Grid<T> extends ResizeComposite implements
                 close();
                 grid.getElement().appendChild(getElement());
                 Grid.setParent(this, grid);
+                // border calculation won't work until attached
+                setHeightToHeaderCellHeight();
             }
         }
 
-- 
cgit v1.2.3