From aff7361b6667542f04801af8df382707544b69f3 Mon Sep 17 00:00:00 2001
From: Henri Sara <hesara@vaadin.com>
Date: Tue, 29 Aug 2017 14:56:36 +0300
Subject: Omit duplicate caption for a Panel in a Composite

Correctly render components that handle their own captions inside
a Composite.

Fixes #9848
---
 .../java/com/vaadin/client/ui/composite/CompositeConnector.java  | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'client/src')

diff --git a/client/src/main/java/com/vaadin/client/ui/composite/CompositeConnector.java b/client/src/main/java/com/vaadin/client/ui/composite/CompositeConnector.java
index 3322063d51..9b784b7f70 100644
--- a/client/src/main/java/com/vaadin/client/ui/composite/CompositeConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/composite/CompositeConnector.java
@@ -116,4 +116,13 @@ public class CompositeConnector extends AbstractHasComponentsConnector
             ((DirectionalManagedLayout) childConnector).layoutVertically();
         }
     }
+
+    @Override
+    public boolean delegateCaptionHandling() {
+        if (!hasChildConnector()) {
+            return true;
+        } else {
+            return getChildConnector().delegateCaptionHandling();
+        }
+    }
 }
-- 
cgit v1.2.3