Dispose dialogs while returning to demo host

Author: shai-almog

docs/demos/common/src/test/java/com/codenameone/developerguide/animations/AnimationDemosScreenshotTest.java

@@ -8,6 +8,7 @@
 import com.codename1.ui.Button;
 import com.codename1.ui.Component;
 import com.codename1.ui.Container;
+import com.codename1.ui.Dialog;
 import com.codename1.ui.Display;
 import com.codename1.ui.Form;
 import com.codename1.ui.Image;
@@ -171,7 +172,7 @@ private void returnToHost(Form demoForm, Form host) {
         long deadline = System.currentTimeMillis() + FORM_TIMEOUT_MS;
 
         if (demoForm != null && demoForm != currentForm()) {
-            demoForm.showBack();
+            unwindForm(demoForm, host);
         }
 
         while (System.currentTimeMillis() <= deadline) {
@@ -183,10 +184,11 @@ private void returnToHost(Form demoForm, Form host) {
             if (active == null) {
                 host.show();
             } else {
-                active.showBack();
+                unwindForm(active, host);
             }
 
-            TestUtils.waitFor(150);
+            Display.getInstance().animate();
+            TestUtils.waitFor(120);
         }
 
         if (currentForm() != host) {
@@ -196,6 +198,23 @@ private void returnToHost(Form demoForm, Form host) {
         waitForHost(host);
     }
 
+    private void unwindForm(Form form, Form host) {
+        if (form == null) {
+            return;
+        }
+
+        if (form instanceof Dialog) {
+            ((Dialog) form).dispose();
+            return;
+        }
+
+        if (form == host) {
+            return;
+        }
+
+        form.showBack();
+    }
+
     private Form currentForm() {
         Component current = Display.getInstance().getCurrent();
         return (current instanceof Form) ? (Form) current : null;