From 67f669035a12d6c0ec3661f283d28717279e144d Mon Sep 17 00:00:00 2001
From: Anna Koskinen <anna@vaadin.com>
Date: Tue, 28 Oct 2014 16:51:45 +0200
Subject: TreeTable column header and footer height fix (#15121)

Fix for regression caused by (#14812) + Valo test for TreeTables.

Change-Id: I57f911cbf33e52196fa219b4feddfe62db7f6ded
---
 WebContent/VAADIN/themes/valo/components/_treetable.scss     | 6 ++++++
 uitest/src/com/vaadin/tests/themes/valo/ValoThemeUITest.java | 9 +++++++++
 2 files changed, 15 insertions(+)

diff --git a/WebContent/VAADIN/themes/valo/components/_treetable.scss b/WebContent/VAADIN/themes/valo/components/_treetable.scss
index e025df2bc9..60b696315b 100644
--- a/WebContent/VAADIN/themes/valo/components/_treetable.scss
+++ b/WebContent/VAADIN/themes/valo/components/_treetable.scss
@@ -14,6 +14,12 @@
       padding-left: 0;
       padding-right: 0;
     }
+    
+    [class*="caption-container"],
+    [class*="footer-container"] {
+      $vertical-padding: round(($v-table-row-height - $v-table-header-font-size)/2);
+      min-height: $v-table-row-height - $vertical-padding - ($vertical-padding - $v-table-border-width);
+    }
 
     [class*="cell-wrapper"] {
       min-height: $v-font-size;
diff --git a/uitest/src/com/vaadin/tests/themes/valo/ValoThemeUITest.java b/uitest/src/com/vaadin/tests/themes/valo/ValoThemeUITest.java
index b0af0db8c6..92cb837b38 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/ValoThemeUITest.java
+++ b/uitest/src/com/vaadin/tests/themes/valo/ValoThemeUITest.java
@@ -132,6 +132,15 @@ public class ValoThemeUITest extends MultiBrowserTest {
         compareScreen("tables");
     }
 
+    @Test
+    public void treeTables() throws Exception {
+        openTestURL("test");
+        open("Tables");
+        check("Hierarchical");
+        check("Footer");
+        compareScreen("treetables");
+    }
+
     @Test
     public void dragging() throws Exception {
         openTestURL("test");
-- 
cgit v1.2.3