diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-04-04 18:05:28 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2012-04-04 18:21:42 +0300 |
| commit | e77e606383db6f99602e7240d11de84712632518 (patch) | |
| tree | e65728b04ee87fe6a01a5d78b38a47613c0fc672 /src | |
| parent | ef6c88ecc6b1c2d8884468bff1aa0e2040bfa002 (diff) | |
| download | vaadin-framework-e77e606383db6f99602e7240d11de84712632518.tar.gz vaadin-framework-e77e606383db6f99602e7240d11de84712632518.zip | |
Only report sizes for relative children
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VAbstractSplitPanel.java | 37 |
1 files changed, 25 insertions, 12 deletions
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); + } } } |