From: Leif Åstrand <leif@vaadin.com>
Date: Wed, 4 Apr 2012 15:05:28 +0000 (+0300)
Subject: Only report sizes for relative children
X-Git-Tag: 7.0.0.alpha2~65^2~22
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e77e606383db6f99602e7240d11de84712632518;p=vaadin-framework.git

Only report sizes for relative children
---

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VAbstractSplitPanel.java b/src/com/vaadin/terminal/gwt/client/ui/VAbstractSplitPanel.java
index ac71563323..55742f24b3 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VAbstractSplitPanel.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VAbstractSplitPanel.java
@@ -25,6 +25,7 @@ import com.google.gwt.user.client.ui.ComplexPanel;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.BrowserInfo;
+import com.vaadin.terminal.gwt.client.ComponentConnector;
 import com.vaadin.terminal.gwt.client.ConnectorMap;
 import com.vaadin.terminal.gwt.client.LayoutManager;
 import com.vaadin.terminal.gwt.client.Util;
@@ -303,14 +304,20 @@ public class VAbstractSplitPanel extends ComplexPanel {
             if (layoutManager.isLayoutRunning()) {
                 ConnectorMap connectorMap = ConnectorMap.get(client);
                 if (firstChild != null) {
-                    layoutManager.reportWidthAssignedToRelative(
-                            connectorMap.getConnector(firstChild),
-                            pixelPosition);
+                    ComponentConnector connector = connectorMap
+                            .getConnector(firstChild);
+                    if (connector.isRelativeWidth()) {
+                        layoutManager.reportWidthAssignedToRelative(connector,
+                                pixelPosition);
+                    }
                 }
                 if (secondChild != null) {
-                    layoutManager.reportWidthAssignedToRelative(
-                            connectorMap.getConnector(secondChild),
-                            secondContainerWidth);
+                    ComponentConnector connector = connectorMap
+                            .getConnector(secondChild);
+                    if (connector.isRelativeWidth()) {
+                        layoutManager.reportWidthAssignedToRelative(connector,
+                                secondContainerWidth);
+                    }
                 }
             }
             break;
@@ -344,14 +351,20 @@ public class VAbstractSplitPanel extends ComplexPanel {
             if (layoutManager.isLayoutRunning()) {
                 ConnectorMap connectorMap = ConnectorMap.get(client);
                 if (firstChild != null) {
-                    layoutManager.reportHeightAssignedToRelative(
-                            connectorMap.getConnector(firstChild),
-                            pixelPosition);
+                    ComponentConnector connector = connectorMap
+                            .getConnector(firstChild);
+                    if (connector.isRelativeHeight()) {
+                        layoutManager.reportHeightAssignedToRelative(connector,
+                                pixelPosition);
+                    }
                 }
                 if (secondChild != null) {
-                    layoutManager.reportHeightAssignedToRelative(
-                            connectorMap.getConnector(secondChild),
-                            secondContainerHeight);
+                    ComponentConnector connector = connectorMap
+                            .getConnector(secondChild);
+                    if (connector.isRelativeHeight()) {
+                        layoutManager.reportHeightAssignedToRelative(connector,
+                                secondContainerHeight);
+                    }
                 }
             }