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;
@@ -992,6 +991,13 @@ private interface IZoomTransition {
     }
 
     private class ZoomTransition implements Animation, IZoomTransition {
+        /// The top level this transition registered on, so cleanup removes it from
+        /// that one rather than from wherever the chart resolves to when the motion
+        /// ends. A chart removed or reparented in between leaves the animation on the
+        /// original for good: its hasAnimations() stays true, the event dispatch thread
+        /// never sleeps, and the finished branch runs every frame.
+        private com.codename1.ui.TopLevelContainer animationHost;
+
         private final Rectangle currentViewPort;
         private final Rectangle newViewPort;
         private final Transform origTransform;
@@ -1012,8 +1018,9 @@ 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) {
+                animationHost = f;
                 f.registerAnimated(this);
                 this.motion.start();
             } else {
@@ -1022,9 +1029,9 @@ public void start() {
         }
 
         public void cleanup() {
-            Form f = ChartComponent.this.getComponentForm();
-            if (f != null) {
-                f.deregisterAnimated(this);
+            if (animationHost != null) {
+                animationHost.deregisterAnimated(this);
+                animationHost = null;
             }
         }
 
@@ -1087,6 +1094,13 @@ public void paint(Graphics g) {
     }
 
     private class ZoomTransitionXY implements Animation, IZoomTransition {
+        /// The top level this transition registered on, so cleanup removes it from
+        /// that one rather than from wherever the chart resolves to when the motion
+        /// ends. A chart removed or reparented in between leaves the animation on the
+        /// original for good: its hasAnimations() stays true, the event dispatch thread
+        /// never sleeps, and the finished branch runs every frame.
+        private com.codename1.ui.TopLevelContainer animationHost;
+
         private final BBox currentViewPort;
         private final BBox newViewPort;
         private final Motion motion;
@@ -1101,8 +1115,9 @@ 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) {
+                animationHost = f;
                 f.registerAnimated(this);
                 this.motion.start();
             } else {
@@ -1111,9 +1126,9 @@ public void start() {
         }
 
         public void cleanup() {
-            Form f = ChartComponent.this.getComponentForm();
-            if (f != null) {
-                f.deregisterAnimated(this);
+            if (animationHost != null) {
+                animationHost.deregisterAnimated(this);
+                animationHost = null;
             }
         }
 

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

@@ -39,6 +39,10 @@
 /// @author shannah
 public abstract class SeriesTransition implements Animation {
 
+    /// The top level this transition registered on, so it is removed from that one
+    /// rather than from wherever the chart resolves to when the motion ends.
+    private com.codename1.ui.TopLevelContainer animationHost;
+
 
     public static final int EASING_LINEAR = 1;
     public static final int EASING_IN = 2;
@@ -119,7 +123,10 @@ protected void cleanup() {
     public boolean animate() {
         if (finished) {
             cleanup();
-            chart.getComponentForm().deregisterAnimated(this);
+            if (animationHost != null) {
+                animationHost.deregisterAnimated(this);
+                animationHost = null;
+            }
             return false;
         } else if (motion.isFinished()) {
             finished = true;
@@ -194,7 +201,13 @@ 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) {
+            animationHost = top;
+            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/FloatingActionButton.java

@@ -352,8 +352,11 @@ public Container bindFabToContainer(Component cnt, int orientation, int valign)
         FlowLayout flow = new FlowLayout(orientation);
         flow.setValign(valign);
 
-        Form f = cnt.getComponentForm();
-        if (f != null && (f.getContentPane() == cnt || f == cnt)) { //NOPMD CompareObjectsWithEquals
+        // The top level rather than the form: getComponentForm() is null by design in a
+        // Window, so binding to a window's content pane fell through to the wrapper
+        // below and returned it unattached -- the button simply never appeared.
+        com.codename1.ui.TopLevelContainer f = cnt.getTopLevelContainer();
+        if (f != null && (f.getContentPane() == cnt || f.asContainer() == cnt)) { //NOPMD CompareObjectsWithEquals
             // special case for content pane installs the button directly on the content pane
             Container layers = f.getLayeredPane(getClass(), true);
             layers.setSafeArea(true);
@@ -386,9 +389,18 @@ public void setText(String text) {
 
     @Override
     protected void fireActionEvent(int x, int y) {
-        Form current = Display.getInstance().getCurrent();
-        if (current instanceof Dialog) {
-            ((Dialog) current).dispose();
+        // This button's own top level, not the process-wide current form. A button in a
+        // secondary window would otherwise dispose a dialog showing on the main window
+        // -- activating a window does not change Display.getCurrent(), so the dialog it
+        // closed had nothing to do with the click.
+        com.codename1.ui.TopLevelContainer top = getTopLevelContainer();
+        if (top instanceof Dialog) {
+            ((Dialog) top).dispose();
+        } else if (top == null || top instanceof Form) {
+            Form current = Display.getInstance().getCurrent();
+            if (current instanceof Dialog) {
+                ((Dialog) current).dispose();
+            }
         }
         super.fireActionEvent(x, y);
     }
@@ -404,6 +416,15 @@ public void released(int x, int y) {
         }
         //if this fab has sub fab's display them
         if (subMenu != null) {
+            // The submenu is shown in a Dialog, which is not top-level-aware: inside a
+            // Window getComponentForm() is null by design, and the tint calls below
+            // dereferenced it without checking, so releasing a sub-menu FAB in a window
+            // threw out of the button press. There is nothing to show there until
+            // Dialog itself becomes window-aware, but a standard component must not
+            // throw to say so -- see the unsupported list in the desktop windows guide.
+            if (getComponentForm() == null) {
+                return;
+            }
             final Container con = createPopupContent(subMenu);
             Dialog d = new Dialog();
             d.setDialogUIID("Container");

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);
             }