From 77a0d562a330e15463e0cd29d1b87a5b312c8bf5 Mon Sep 17 00:00:00 2001
From: Ilia Motornyi <elmot@vaadin.com>
Date: Tue, 23 May 2017 15:10:45 +0300
Subject: New Tree component theme

Fixes #9310
---
 .../com/vaadin/client/connectors/grid/TreeRendererConnector.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'client')

diff --git a/client/src/main/java/com/vaadin/client/connectors/grid/TreeRendererConnector.java b/client/src/main/java/com/vaadin/client/connectors/grid/TreeRendererConnector.java
index 4540ce5d63..df0da24e99 100644
--- a/client/src/main/java/com/vaadin/client/connectors/grid/TreeRendererConnector.java
+++ b/client/src/main/java/com/vaadin/client/connectors/grid/TreeRendererConnector.java
@@ -42,7 +42,9 @@ public class TreeRendererConnector
 
             @Override
             public void render(RendererCellReference cell, String htmlString) {
-                String content = SafeHtmlUtils.htmlEscape(htmlString);
+                String content = "<span class=\"v-captiontext\">" +
+                        SafeHtmlUtils.htmlEscape(htmlString)
+                        + "</span>";
 
                 JsonObject row = getParent().getParent().getDataSource()
                         .getRow(cell.getRowIndex());
@@ -50,7 +52,7 @@ public class TreeRendererConnector
                     String resourceId = row.getString("itemIcon");
                     Element element = getConnection()
                             .getIcon(getResourceUrl(resourceId)).getElement();
-                    content = element.getString() + " " + content;
+                    content = element.getString() + content;
                 }
                 super.render(cell, content);
             }
-- 
cgit v1.2.3