diff options
| author | Matti Tahvonen <matti.tahvonen@itmill.com> | 2008-12-11 06:58:25 +0000 |
|---|---|---|
| committer | Matti Tahvonen <matti.tahvonen@itmill.com> | 2008-12-11 06:58:25 +0000 |
| commit | 2068a0dd49ae8ca1546bc9380f9c80441d9b6fad (patch) | |
| tree | d77d69d13a1826d329e43152e02648f17c14b63a /src | |
| parent | b4d722c596fb51a31eef95ca5d17dae3d3bb64af (diff) | |
| download | vaadin-framework-2068a0dd49ae8ca1546bc9380f9c80441d9b6fad.tar.gz vaadin-framework-2068a0dd49ae8ca1546bc9380f9c80441d9b6fad.zip | |
fixes relative size change propagation in OL if contained component have changed
svn changeset:6159/svn branch:trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java index a626bcaae1..cd4070ee6c 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java @@ -665,22 +665,21 @@ public class IOrderedLayout extends CellBasedLayout { private void recalculateLayoutAndComponentSizes() {
recalculateLayout();
+ if (!(isDynamicHeight() && isDynamicWidth())) {
+ /* First update relative sized components */
+ for (ChildComponentContainer componentContainer : widgetToComponentContainer
+ .values()) {
+ client.handleComponentRelativeSize(componentContainer
+ .getWidget());
+ }
+ }
+
if (isDynamicHeight()) {
/*
* Height is not necessarily correct anymore as the height of
* components might have changed if the width has changed.
*/
- /* First update relative sized components */
- for (ChildComponentContainer componentContainer : widgetToComponentContainer
- .values()) {
- if (componentContainer
- .isComponentRelativeSized(ORIENTATION_HORIZONTAL)) {
- client.handleComponentRelativeSize(componentContainer
- .getWidget());
- }
- }
-
/*
* Get the new widget sizes from DOM and calculate new container
* sizes
|