diff options
author | Automerge <automerge@vaadin.com> | 2012-03-06 10:06:17 +0000 |
---|---|---|
committer | Automerge <automerge@vaadin.com> | 2012-03-06 10:06:17 +0000 |
commit | c5260fb30e4cc43df99ffb09791b6d98e2a1e1a2 (patch) | |
tree | 5ba4c5bd63d17c26faee62b069a276de5315cec3 | |
parent | 630410e7a15cc948ae13519e279678a1085081a5 (diff) | |
download | vaadin-framework-c5260fb30e4cc43df99ffb09791b6d98e2a1e1a2.tar.gz vaadin-framework-c5260fb30e4cc43df99ffb09791b6d98e2a1e1a2.zip |
[merge from 6.7] Update window contents after changing the size (#3401)
svn changeset:23186/svn branch:6.8
-rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VView.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VView.java b/src/com/vaadin/terminal/gwt/client/ui/VView.java index 46a7df9efb..f48fc7c195 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VView.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VView.java @@ -156,6 +156,7 @@ public class VView extends SimplePanel implements Container, ResizeHandler, private void ensureSubWindowsVisible() { for (VWindow subWindow : subWindows) { + // First process width as it might affect the height int oldLeft = subWindow.getPopupLeft(); int oldWidth = subWindow.getOffsetWidth(); int oldRight = oldLeft + oldWidth; @@ -167,9 +168,11 @@ public class VView extends SimplePanel implements Container, ResizeHandler, if (newLeft < 0) { newLeft = 0; subWindow.setWidth(width + "px"); + subWindow.updateContentsSize(); } } + // Process height once the width is final int oldTop = subWindow.getPopupTop(); int oldHeight = subWindow.getOffsetHeight(); int oldBottom = oldTop + oldHeight; @@ -181,6 +184,7 @@ public class VView extends SimplePanel implements Container, ResizeHandler, if (newTop < 0) { newTop = 0; subWindow.setHeight(height + "px"); + subWindow.updateContentsSize(); } } |