Merge pull request #25 from codenameone/master

Update from CN1

Author: ThomasH99

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

@@ -36,6 +36,7 @@
 import com.codename1.ui.Sheet;
 import com.codename1.ui.events.ActionEvent;
 import com.codename1.ui.events.ActionListener;
+import com.codename1.ui.events.ActionSource;
 import com.codename1.ui.geom.Dimension;
 import com.codename1.ui.layouts.BorderLayout;
 import com.codename1.ui.layouts.BoxLayout;
@@ -50,7 +51,7 @@
  * @author shannah
  * @since 7.0
  */
-public class AudioRecorderComponent extends Container {
+public class AudioRecorderComponent extends Container implements ActionSource {
     private Media media;
     private Button record, pause, done;
     private Label recordingInProgress, recordingOff;

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

@@ -28,6 +28,7 @@
 import com.codename1.ui.RadioButton;
 import com.codename1.ui.events.ActionEvent;
 import com.codename1.ui.events.ActionListener;
+import com.codename1.ui.events.ActionSource;
 import com.codename1.ui.events.DataChangedListener;
 import com.codename1.ui.events.SelectionListener;
 import com.codename1.ui.layouts.Layout;
@@ -88,7 +89,7 @@
  * @author Steve Hannah
  * @since 6.0
  */
-public abstract class ButtonList extends Container implements DataChangedListener, SelectionListener, ActionListener {
+public abstract class ButtonList extends Container implements DataChangedListener, SelectionListener, ActionListener, ActionSource {
     private ButtonGroup group;
     private ListModel model;
     private EventDispatcher actionListeners = new EventDispatcher();

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

@@ -262,7 +262,7 @@ private Container getLayeredPane(Form f) {
         if(formMode) {
             c = (Container)f.getFormLayeredPane(InteractionDialog.class, true);
         } else {
-            c = (Container)f.getLayeredPane(InteractionDialog.class, false);
+            c = (Container)f.getLayeredPane(InteractionDialog.class, true);
         }
         if (!(c.getLayout() instanceof LayeredLayout)) {
             c.setLayout(new LayeredLayout());
@@ -623,12 +623,18 @@ public void actionPerformed(ActionEvent evt) {
      * @param c the context component which is used to position the dialog and can also be pointed at
      */
     public void showPopupDialog(Component c) {
+        Form f = c== null ? null : c.getComponentForm();
+        if (f != null) {
+            if (!formMode && !f.getContentPane().contains(c)) {
+                setFormMode(true);
+            }
+        }
         disposed = false;
         getUnselectedStyle().setOpacity(255);
         Rectangle componentPos = c.getSelectedRect();
         componentPos.setX(componentPos.getX() - c.getScrollX());
         componentPos.setY(componentPos.getY() - c.getScrollY());
-        
+        setOwner(c);
         showPopupDialog(componentPos);
     }
 

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

@@ -31,6 +31,7 @@
 import com.codename1.ui.Label;
 import com.codename1.ui.RadioButton;
 import com.codename1.ui.events.ActionListener;
+import com.codename1.ui.events.ActionSource;
 import com.codename1.ui.layouts.BorderLayout;
 import com.codename1.ui.layouts.BoxLayout;
 import com.codename1.ui.layouts.FlowLayout;
@@ -49,7 +50,7 @@
  * @see SpanButton
  * @author Shai Almog
  */
-public class MultiButton extends Container {
+public class MultiButton extends Container implements ActionSource {
     private Label firstRow = new Label("MultiButton");
     private Label secondRow = new Label();
     private Label thirdRow = new Label();

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

@@ -32,6 +32,7 @@
 import com.codename1.ui.animations.Motion;
 import com.codename1.ui.events.ActionEvent;
 import com.codename1.ui.events.ActionListener;
+import com.codename1.ui.events.ActionSource;
 import com.codename1.ui.geom.Dimension;
 import com.codename1.ui.layouts.BoxLayout;
 import com.codename1.ui.plaf.Style;
@@ -51,7 +52,7 @@
  * @author Shai Almog
  * @deprecated Use new {@link Switch} class instead as it conforms to the latest platform looks and feels.
  */
-public class OnOffSwitch extends Container {
+public class OnOffSwitch extends Container implements ActionSource {
     private String on = "ON";
     private String off = "OFF";
     private boolean iosMode;

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

@@ -44,6 +44,9 @@
  */
 public class ScaleImageLabel extends Label {
 
+    private int preferredH = -1;
+    private int preferredW = -1;
+    
     /**
      * Default constructor
      */
@@ -223,5 +226,55 @@ public String setPropertyValue(String name, Object value) {
         }
         return super.setPropertyValue(name, value);
     }
+
+    @Override
+    public void setPreferredH(int preferredH) {
+        this.preferredH = preferredH;
+    }
+
+    @Override
+    public void setPreferredW(int preferredW) {
+        this.preferredW = preferredW;
+    }
+
+    @Override
+    public int getPreferredH() {
+        if (preferredH > 0) {
+            return preferredH;
+        }
+        if (preferredW > 0) {
+            Image i = getIcon();
+            if (i != null) {
+                if (preferredW < i.getWidth()) {
+                    return (int)(i.getHeight() * preferredW / (double)i.getWidth());
+                }
+            }
+        }
+        return super.getPreferredH();
+    }
+
+    @Override
+    public int getPreferredW() {
+        if (preferredW > 0) {
+            return preferredW;
+        }
+        if (preferredW > 0) {
+            Image i = getIcon();
+            if (i != null) {
+                if (preferredH < i.getHeight()) {
+                    return (int)(i.getWidth() * preferredH / (double)i.getHeight());
+                }
+            }
+        }
+        return super.getPreferredW();
+    }
+    
+    
+    
+    
+    
+    
+    
+    
 
 }

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

@@ -34,6 +34,7 @@
 import com.codename1.ui.animations.Animation;
 import com.codename1.ui.events.ActionEvent;
 import com.codename1.ui.events.ActionListener;
+import com.codename1.ui.events.ActionSource;
 import com.codename1.ui.geom.Dimension;
 import com.codename1.ui.geom.GeneralPath;
 import com.codename1.ui.geom.Rectangle;
@@ -69,7 +70,7 @@
  * @author shannah
  * @since 3.4
  */
-public class SignatureComponent extends Container {
+public class SignatureComponent extends Container implements ActionSource {
 
     private Image signatureImage;
     private final Button lead;

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

@@ -30,6 +30,7 @@
 import com.codename1.ui.Image;
 import com.codename1.ui.TextArea;
 import com.codename1.ui.events.ActionListener;
+import com.codename1.ui.events.ActionSource;
 import com.codename1.ui.geom.Dimension;
 import com.codename1.ui.layouts.BorderLayout;
 import com.codename1.ui.layouts.BoxLayout;
@@ -47,7 +48,7 @@
  *
  * @author Shai Almog
  */
-public class SpanButton extends Container {
+public class SpanButton extends Container implements ActionSource {
 
     private Button actualButton;
     private TextArea text;
@@ -84,6 +85,7 @@ public SpanButton(String txt) {
         text.setEditable(false);
         text.setFocusable(false);
         text.setActAsLabel(true);
+        setFocusable(true);
         removeBackground(text.getUnselectedStyle());
         removeBackground(text.getSelectedStyle());
         removeBackground(text.getPressedStyle());
@@ -207,6 +209,24 @@ public Image getIcon() {
         return actualButton.getIcon();
     }
 
+    /**
+     * Binds long press listener to button events.
+     * @param l 
+     * @since 7.0
+     */
+    public void addLongPressListener(ActionListener l) {
+        actualButton.addLongPressListener(l);
+    }
+    
+    /**
+     * Unbinds long press listener to button events.
+     * @param l 
+     * @since 7.0
+     */
+    public void removeLongPressListener(ActionListener l) {
+        actualButton.removeLongPressListener(l);
+    }
+    
     /**
      * Binds an action listener to button events
      *