From: Leif Åstrand <leif@vaadin.com>
Date: Wed, 22 May 2013 10:59:44 +0000 (+0300)
Subject: Send window mode changes to the server immediately (#11737)
X-Git-Tag: 7.1.0~90^2~37
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cb1f63b8606ae23088a62f26dc8979885c5cd19c;p=vaadin-framework.git

Send window mode changes to the server immediately (#11737)

Change-Id: Icfaa8f97824d8ed92eaee786cee8c92083dc1084
---

diff --git a/shared/src/com/vaadin/shared/ui/window/WindowServerRpc.java b/shared/src/com/vaadin/shared/ui/window/WindowServerRpc.java
index cfb10ad86a..b43765274e 100644
--- a/shared/src/com/vaadin/shared/ui/window/WindowServerRpc.java
+++ b/shared/src/com/vaadin/shared/ui/window/WindowServerRpc.java
@@ -15,13 +15,11 @@
  */
 package com.vaadin.shared.ui.window;
 
-import com.vaadin.shared.annotations.Delayed;
 import com.vaadin.shared.communication.ServerRpc;
 import com.vaadin.shared.ui.ClickRpc;
 
 public interface WindowServerRpc extends ClickRpc, ServerRpc {
 
-    @Delayed(lastOnly = true)
     public void windowModeChanged(WindowMode newState);
 
 }
\ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.html b/uitest/src/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.html
index 945564f298..dcdfa05687 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.html
+++ b/uitest/src/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.html
@@ -162,17 +162,6 @@
 	<td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VNativeButton[0]</td>
 	<td>43,12</td>
 </tr>
-<!--Remove the following two commands once #11737 is fixed-->
-<tr>
-	<td>mouseClick</td>
-	<td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VNativeButton[0]</td>
-	<td>43,12</td>
-</tr>
-<tr>
-	<td>mouseClick</td>
-	<td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/Slot[0]/VNativeButton[0]</td>
-	<td>43,12</td>
-</tr>
 <!--maximize window 2 content-->
 <tr>
 	<td>mouseClick</td>
@@ -234,6 +223,37 @@
 	<td></td>
 	<td>window-1-maximized-with-doubleclick</td>
 </tr>
+<!--Test that size and position is preserved when maximizing and restoring-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[1]</td>
+	<td>8,4</td>
+</tr>
+<tr>
+	<td>dragAndDrop</td>
+	<td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+	<td>-200,-200</td>
+</tr>
+<tr>
+	<td>dragAndDrop</td>
+	<td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[4]/domChild[0]</td>
+	<td>+100,+100</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[1]</td>
+	<td>6,5</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[1]</td>
+	<td>5,8</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>window-1-moved-maximized-restored</td>
+</tr>
 </tbody></table>
 </body>
 </html>