From 1951fe6e402e2440cfa0f2ac9937904daeed3e47 Mon Sep 17 00:00:00 2001
From: Denis Anisimov <denis@vaadin.com>
Date: Sun, 2 Nov 2014 13:11:09 +0200
Subject: ICON_ONLY mode should not show icon row header for TreeTable
 (#14799).

Change-Id: If854186547e3d7b8e67710113ec6754bc84ace2f
---
 server/src/com/vaadin/ui/Table.java     | 2 +-
 server/src/com/vaadin/ui/TreeTable.java | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'server/src/com/vaadin/ui')

diff --git a/server/src/com/vaadin/ui/Table.java b/server/src/com/vaadin/ui/Table.java
index 34d48a9b18..a0d9896770 100644
--- a/server/src/com/vaadin/ui/Table.java
+++ b/server/src/com/vaadin/ui/Table.java
@@ -3854,7 +3854,7 @@ public class Table extends AbstractSelect implements Action.Container,
         }
     }
 
-    private boolean rowHeadersAreEnabled() {
+    protected boolean rowHeadersAreEnabled() {
         return getRowHeaderMode() != ROW_HEADER_MODE_HIDDEN;
     }
 
diff --git a/server/src/com/vaadin/ui/TreeTable.java b/server/src/com/vaadin/ui/TreeTable.java
index 9bca20587b..63b54a6ced 100644
--- a/server/src/com/vaadin/ui/TreeTable.java
+++ b/server/src/com/vaadin/ui/TreeTable.java
@@ -410,6 +410,14 @@ public class TreeTable extends Table implements Hierarchical {
         }
     }
 
+    @Override
+    protected boolean rowHeadersAreEnabled() {
+        if (getRowHeaderMode() == RowHeaderMode.ICON_ONLY) {
+            return false;
+        }
+        return super.rowHeadersAreEnabled();
+    }
+
     @Override
     public void changeVariables(Object source, Map<String, Object> variables) {
         super.changeVariables(source, variables);
-- 
cgit v1.2.3