Native desktop windows

CodenameOne/src/com/codename1/charts/ChartComponent.java

@@ -29,7 +29,6 @@
 import com.codename1.charts.views.XYChart;
 import com.codename1.ui.Component;
 import com.codename1.ui.Display;
-import com.codename1.ui.Form;
 import com.codename1.ui.Graphics;
 import com.codename1.ui.Transform;
 import com.codename1.ui.animations.Animation;
@@ -1012,7 +1011,7 @@ private class ZoomTransition implements Animation, IZoomTransition {
 
         @Override
         public void start() {
-            Form f = ChartComponent.this.getComponentForm();
+            com.codename1.ui.TopLevelContainer f = ChartComponent.this.getTopLevelContainer();
             if (f != null) {
                 f.registerAnimated(this);
                 this.motion.start();
@@ -1022,7 +1021,7 @@ public void start() {
         }
 
         public void cleanup() {
-            Form f = ChartComponent.this.getComponentForm();
+            com.codename1.ui.TopLevelContainer f = ChartComponent.this.getTopLevelContainer();
             if (f != null) {
                 f.deregisterAnimated(this);
             }
@@ -1101,7 +1100,7 @@ private class ZoomTransitionXY implements Animation, IZoomTransition {
 
         @Override
         public void start() {
-            Form f = ChartComponent.this.getComponentForm();
+            com.codename1.ui.TopLevelContainer f = ChartComponent.this.getTopLevelContainer();
             if (f != null) {
                 f.registerAnimated(this);
                 this.motion.start();
@@ -1111,7 +1110,7 @@ public void start() {
         }
 
         public void cleanup() {
-            Form f = ChartComponent.this.getComponentForm();
+            com.codename1.ui.TopLevelContainer f = ChartComponent.this.getTopLevelContainer();
             if (f != null) {
                 f.deregisterAnimated(this);
             }

CodenameOne/src/com/codename1/charts/transitions/SeriesTransition.java

@@ -119,7 +119,10 @@ protected void cleanup() {
     public boolean animate() {
         if (finished) {
             cleanup();
-            chart.getComponentForm().deregisterAnimated(this);
+            com.codename1.ui.TopLevelContainer top = chart.getTopLevelContainer();
+            if (top != null) {
+                top.deregisterAnimated(this);
+            }
             return false;
         } else if (motion.isFinished()) {
             finished = true;
@@ -194,7 +197,12 @@ public void setEasing(int easing) {
     /// current animation settings.
     public void animateChart() {
         initTransition();
-        chart.getComponentForm().registerAnimated(this);
+        // The chart's top level rather than its form: getComponentForm() is null by
+        // design inside a Window, so a chart transition threw there.
+        com.codename1.ui.TopLevelContainer top = chart.getTopLevelContainer();
+        if (top != null) {
+            top.registerAnimated(this);
+        }
 
     }
 

CodenameOne/src/com/codename1/components/Ads.java

@@ -28,7 +28,6 @@
 import com.codename1.ui.Component;
 import com.codename1.ui.Container;
 import com.codename1.ui.Display;
-import com.codename1.ui.Form;
 import com.codename1.ui.Label;
 import com.codename1.ui.TextArea;
 import com.codename1.ui.TextField;
@@ -42,6 +41,7 @@
 import com.codename1.ui.html.HTMLElement;
 import com.codename1.ui.html.IOCallback;
 import com.codename1.ui.layouts.BorderLayout;
+import com.codename1.ui.TopLevelContainer;
 
 import java.util.Vector;
 
@@ -127,7 +127,13 @@ public void actionPerformed(ActionEvent evt) {
             });
 
             if (refreshAd) {
-                getComponentForm().registerAnimated(this);
+                // The top level rather than the form: getComponentForm() is null
+                // by design inside a Window, so this both threw and left the
+                // animation unregistered there.
+                TopLevelContainer topLevel = getTopLevelContainer();
+                if (topLevel != null) {
+                    topLevel.registerAnimated(this);
+                }
             } else {
                 requestAd();
             }
@@ -138,7 +144,13 @@ public void actionPerformed(ActionEvent evt) {
     @Override
     protected void deinitialize() {
         if (refreshAd) {
-            getComponentForm().deregisterAnimated(this);
+            // The top level rather than the form: getComponentForm() is null
+            // by design inside a Window, so this both threw and left the
+            // animation unregistered there.
+            TopLevelContainer topLevel = getTopLevelContainer();
+            if (topLevel != null) {
+                topLevel.deregisterAnimated(this);
+            }
         }
     }
 
@@ -150,8 +162,11 @@ private void requestAd() {
     /// {@inheritDoc}
     @Override
     public boolean animate() {
-        Form parent = getComponentForm();
-        if (parent == null || !parent.isVisible()) {
+        // The top level's visibility rather than an enclosing Form's: getComponentForm()
+        // is null by design inside a Window, so this returned immediately there and the
+        // refresh the registration had just been fixed to enable never actually ran.
+        TopLevelContainer parent = getTopLevelContainer();
+        if (parent == null || !parent.asContainer().isVisible()) {
             return false;
         }
         long t = System.currentTimeMillis();

CodenameOne/src/com/codename1/components/AudioRecorderComponent.java

@@ -42,6 +42,7 @@
 import com.codename1.ui.layouts.FlowLayout;
 import com.codename1.ui.layouts.LayeredLayout;
 import com.codename1.ui.util.EventDispatcher;
+import com.codename1.ui.TopLevelContainer;
 
 import java.io.IOException;
 
@@ -532,12 +533,24 @@ public void actionPerformed(ActionEvent evt) {
     @Override
     protected void initComponent() {
         super.initComponent();
-        getComponentForm().registerAnimated(this);
+        // The top level rather than the form: getComponentForm() is null
+        // by design inside a Window, so this both threw and left the
+        // animation unregistered there.
+        TopLevelContainer topLevel = getTopLevelContainer();
+        if (topLevel != null) {
+            topLevel.registerAnimated(this);
+        }
     }
 
     @Override
     protected void deinitialize() {
-        getComponentForm().deregisterAnimated(this);
+        // The top level rather than the form: getComponentForm() is null
+        // by design inside a Window, so this both threw and left the
+        // animation unregistered there.
+        TopLevelContainer topLevel = getTopLevelContainer();
+        if (topLevel != null) {
+            topLevel.deregisterAnimated(this);
+        }
         super.deinitialize();
     }
 

CodenameOne/src/com/codename1/components/FloatingHint.java

@@ -33,6 +33,8 @@
 import com.codename1.ui.events.FocusListener;
 import com.codename1.ui.layouts.BorderLayout;
 import com.codename1.ui.layouts.LayeredLayout;
+import com.codename1.ui.TopLevelContainer;
+import com.codename1.ui.Window;
 
 /// A floating hint is similar to a text field with a hint. However, when the text field has text in it the hint appears
 /// above the text field instead including an animation when focus hits the text field see
@@ -107,17 +109,27 @@ public void focusLost(Component cmp) {
         tf.addFocusListener(fl);
     }
 
+    /// Revalidates the surface a component lives in, whether that is a form or a
+    /// window.
+    private static void revalidateTopLevel(Component c) {
+        TopLevelContainer top = c.getTopLevelContainer();
+        if (top != null) {
+            top.asContainer().revalidate();
+        }
+    }
+
     private void focusGainedImpl() {
         if (isInitializedImpl()) {
             hintButton.setFocus(true);
             if (!hintButton.isVisible()) {
                 hintButton.setVisible(true);
-                if (getComponentForm().grabAnimationLock()) {
+                TopLevelContainer top = getTopLevelContainer();
+                if (top != null && top.grabAnimationLock()) {
                     morphAndWait(hintLabel, hintButton, 150);
-                    getComponentForm().releaseAnimationLock();
+                    top.releaseAnimationLock();
                 }
                 hintLabel.setVisible(false);
-                tf.getComponentForm().revalidate();
+                revalidateTopLevel(tf);
                 tf.setEditable(true);
                 tf.startEditingAsync();
             } else {
@@ -132,21 +144,37 @@ private void focusGainedImpl() {
         }
     }
 
+    /// True when this hint is attached to the surface currently on screen.
+    ///
+    /// Comparing `Display#getCurrent()` -- which only ever names a `Form` -- against
+    /// `getComponentForm()`, null inside a `Window`, was false for every floating hint
+    /// in a window, so the animated hint silently degraded to the plain branch there.
     private boolean isInitializedImpl() {
-        return isInitialized() && getComponentForm() == Display.getInstance().getCurrent(); //NOPMD CompareObjectsWithEquals
+        if (!isInitialized()) {
+            return false;
+        }
+        TopLevelContainer top = getTopLevelContainer();
+        if (top == null) {
+            return false;
+        }
+        if (top instanceof Window) {
+            return ((Window) top).isWindowShowing();
+        }
+        return Display.getInstance().getCurrent() == top; //NOPMD CompareObjectsWithEquals
     }
 
     private void focusLostImpl() {
         if (isInitializedImpl()) {
             hintButton.setFocus(false);
             if (tf.getText().length() == 0) {
                 hintLabel.setVisible(true);
-                if (getComponentForm().grabAnimationLock()) {
+                TopLevelContainer top = getTopLevelContainer();
+                if (top != null && top.grabAnimationLock()) {
                     morphAndWait(hintButton, hintLabel, 150);
-                    getComponentForm().releaseAnimationLock();
+                    top.releaseAnimationLock();
                 }
                 hintButton.setVisible(false);
-                tf.getComponentForm().revalidate();
+                revalidateTopLevel(tf);
                 revalidate();
                 tf.setEditable(false);
             }

CodenameOne/src/com/codename1/components/ImageViewer.java

@@ -27,7 +27,6 @@
 import com.codename1.ui.Display;
 import com.codename1.ui.Font;
 import com.codename1.ui.FontImage;
-import com.codename1.ui.Form;
 import com.codename1.ui.Graphics;
 import com.codename1.ui.Image;
 import com.codename1.ui.ImageFactory;
@@ -40,6 +39,7 @@
 import com.codename1.ui.list.ListModel;
 import com.codename1.ui.plaf.Style;
 import com.codename1.ui.plaf.UIManager;
+import com.codename1.ui.TopLevelContainer;
 
 /// ImageViewer allows zooming/panning an image and potentially flicking between multiple images
 /// within a list of images.
@@ -367,7 +367,13 @@ public void initComponent() {
             image.lock();
         }
         if (image.isAnimation()) {
-            getComponentForm().registerAnimated(this);
+            // The top level rather than the form: getComponentForm() is null
+            // by design inside a Window, so this both threw and left the
+            // animation unregistered there.
+            TopLevelContainer topLevel = getTopLevelContainer();
+            if (topLevel != null) {
+                topLevel.registerAnimated(this);
+            }
         }
         eagerLock();
     }
@@ -448,7 +454,12 @@ public void pointerPressed(int x, int y) {
         pointerPressedThumbnailIndex = getThumbnailIndexAt(x, y);
         currentZoom = zoom;
         delegatingDragToParent = false;
-        getComponentForm().addComponentAwaitingRelease(this);
+        // Resolved through the top level so this works inside a Window, where
+        // getComponentForm() is null and this line threw.
+        TopLevelContainer viewerTop = getTopLevelContainer();
+        if (viewerTop != null) {
+            viewerTop.addComponentAwaitingRelease(this);
+        }
     }
 
     private Container findScrollableYAncestor() {
@@ -807,6 +818,16 @@ protected Dimension calcPreferredSize() {
         if (image != null) {
             return new Dimension(image.getWidth(), image.getHeight());
         }
+        // The surface this viewer lives on, not the main display: inside a Window,
+        // getDisplayWidth() is the main window's and an empty viewer asked for the
+        // whole screen.
+        TopLevelContainer top = getTopLevelContainer();
+        if (top != null) {
+            Container c = top.asContainer();
+            if (c.getWidth() > 0 && c.getHeight() > 0) {
+                return new Dimension(c.getWidth(), c.getHeight());
+            }
+        }
         return new Dimension(Display.getInstance().getDisplayWidth(), Display.getInstance().getDisplayHeight());
     }
 
@@ -830,7 +851,13 @@ public boolean animate() {
             if (motion.isFinished()) {
                 zooming = false;
                 if (!result) {
-                    getComponentForm().deregisterAnimated(this);
+                    // The top level rather than the form: getComponentForm() is null
+                    // by design inside a Window, so this both threw and left the
+                    // animation unregistered there.
+                    TopLevelContainer topLevel = getTopLevelContainer();
+                    if (topLevel != null) {
+                        topLevel.deregisterAnimated(this);
+                    }
                 }
             }
             repaint();
@@ -1104,9 +1131,12 @@ public final void setImage(Image image) {
             updatePositions();
             repaint();
             if (image.isAnimation()) {
-                Form f = getComponentForm();
-                if (f != null) {
-                    f.registerAnimated(this);
+                // The top level, matching every other registration here: inside a
+                // Window getComponentForm() is null, so swapping in an animated image
+                // silently stopped animating it.
+                TopLevelContainer swapTop = getTopLevelContainer();
+                if (swapTop != null) {
+                    swapTop.registerAnimated(this);
                 }
             }
         }
@@ -1269,7 +1299,13 @@ public void setZoom(float zoom) {
             float initZoom = this.zoom;
             motion = Motion.createEaseInOutMotion((int) (initZoom * 10000), (int) (zoom * 10000), 200);
             motion.start();
-            getComponentForm().registerAnimated(this);
+            // The top level rather than the form: getComponentForm() is null
+            // by design inside a Window, so this both threw and left the
+            // animation unregistered there.
+            TopLevelContainer topLevel = getTopLevelContainer();
+            if (topLevel != null) {
+                topLevel.registerAnimated(this);
+            }
         } else {
             this.zoom = zoom;
             updatePositions();
@@ -1306,7 +1342,13 @@ public void setZoom(float zoom, float panPositionX, float panPositionY) {
             float initZoom = this.zoom;
             motion = Motion.createEaseInOutMotion((int) (initZoom * 10000), (int) (zoom * 10000), 200);
             motion.start();
-            getComponentForm().registerAnimated(this);
+            // The top level rather than the form: getComponentForm() is null
+            // by design inside a Window, so this both threw and left the
+            // animation unregistered there.
+            TopLevelContainer topLevel = getTopLevelContainer();
+            if (topLevel != null) {
+                topLevel.registerAnimated(this);
+            }
         } else {
             this.zoom = zoom;
             updatePositions();
@@ -1505,7 +1547,14 @@ public AnimatePanX(float destPan, Image replaceImage, int updatePos) {
             motion.start();
             this.replaceImage = replaceImage;
             this.updatePos = updatePos;
-            Display.getInstance().getCurrent().registerAnimated(this);
+            // This viewer's own top level, not whatever form happens to be current.
+            // Display.getCurrent() only ever names a Form: in a window-only application
+            // it is null and this threw, and with a main form present it registered the
+            // animation against the wrong surface and later deregistered from it.
+            TopLevelContainer panTop = getTopLevelContainer();
+            if (panTop != null) {
+                panTop.registerAnimated(this);
+            }
         }
 
         @Override
@@ -1547,7 +1596,10 @@ public boolean animate() {
                         getImageRight().unlock();
                     }
                 }
-                Display.getInstance().getCurrent().deregisterAnimated(this);
+                TopLevelContainer panTop = getTopLevelContainer();
+                if (panTop != null) {
+                    panTop.deregisterAnimated(this);
+                }
             }
             repaint();
             return false;