summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorHenri Sara <hesara@vaadin.com>2017-08-29 14:56:36 +0300
committerHenri Sara <henri.sara@gmail.com>2017-08-30 12:10:06 +0300
commitaff7361b6667542f04801af8df382707544b69f3 (patch)
treedae76a8035b37b57badf8de71bd8146a88dffd84 /client
parent774e2164ef5f60e566eee2d976ee113a8634d4e0 (diff)
downloadvaadin-framework-aff7361b6667542f04801af8df382707544b69f3.tar.gz
vaadin-framework-aff7361b6667542f04801af8df382707544b69f3.zip
Omit duplicate caption for a Panel in a Composite
Correctly render components that handle their own captions inside a Composite. Fixes #9848
Diffstat (limited to 'client')
-rw-r--r--client/src/main/java/com/vaadin/client/ui/composite/CompositeConnector.java9
1 files changed, 9 insertions, 0 deletions
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();
+ }
+ }
}