diff options
| author | Leif Åstrand <leif@vaadin.com> | 2013-05-22 13:59:44 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-05-28 08:40:46 +0000 |
| commit | cb1f63b8606ae23088a62f26dc8979885c5cd19c (patch) | |
| tree | da767ba5c7209a4f81473ade492905c7580ad458 | |
| parent | 87018cdca42491d192fa3ecdeb6d64d952cee517 (diff) | |
| download | vaadin-framework-cb1f63b8606ae23088a62f26dc8979885c5cd19c.tar.gz vaadin-framework-cb1f63b8606ae23088a62f26dc8979885c5cd19c.zip | |
Send window mode changes to the server immediately (#11737)
Change-Id: Icfaa8f97824d8ed92eaee786cee8c92083dc1084
| -rw-r--r-- | shared/src/com/vaadin/shared/ui/window/WindowServerRpc.java | 2 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.html | 42 |
2 files changed, 31 insertions, 13 deletions
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> |