diff options
| author | Sauli Tähkäpää <sauli@vaadin.com> | 2014-03-28 16:41:19 +0200 |
|---|---|---|
| committer | Sauli Tähkäpää <sauli@vaadin.com> | 2014-03-28 16:42:30 +0200 |
| commit | 6a06c3a04c9d2a7408d3b69f4863096425e90e3c (patch) | |
| tree | 6c574ca779dfcbd9b4d0acc8d4417bc50edf0665 /client | |
| parent | 2ea5ad5279af4259232082c219c0e2e14524b15f (diff) | |
| parent | 5b3ae6d62e5ff49ef0b204ed27b1004399a19aac (diff) | |
| download | vaadin-framework-6a06c3a04c9d2a7408d3b69f4863096425e90e3c.tar.gz vaadin-framework-6a06c3a04c9d2a7408d3b69f4863096425e90e3c.zip | |
Merge remote-tracking branch 'origin/7.1'
Change-Id: I17fa1bf6982c8c7e1f9faf26b77593b170fa5fdd
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/com/vaadin/client/ui/VWindow.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/ui/VWindow.java b/client/src/com/vaadin/client/ui/VWindow.java index d6dd9c7b1d..6a908aaa29 100644 --- a/client/src/com/vaadin/client/ui/VWindow.java +++ b/client/src/com/vaadin/client/ui/VWindow.java @@ -679,9 +679,14 @@ public class VWindow extends VWindowOverlay implements } super.hide(); + int curIndex = windowOrder.indexOf(this); // Remove window from windowOrder to avoid references being left // hanging. - windowOrder.remove(this); + windowOrder.remove(curIndex); + // Update the z-indices of any remaining windows + while (curIndex < windowOrder.size()) { + windowOrder.get(curIndex).setWindowOrder(curIndex++); + } } private void fixIE8FocusCaptureIssue() { |