swingme-svn — subversion diffs

[Swingme-svn] SF.net SVN: swingme:[2585] iOSME/src/net/yura/ios/WebViewControllear.java

[<yu...@us...>]

Revision: 2585
          http://sourceforge.net/p/swingme/code/2585
Author:   yuranet
Date:     2021-11-09 01:05:05 +0000 (Tue, 09 Nov 2021)
Log Message:
-----------
font size fix

Modified Paths:
--------------
    iOSME/src/net/yura/ios/WebViewControllear.java

Modified: iOSME/src/net/yura/ios/WebViewControllear.java
===================================================================
--- iOSME/src/net/yura/ios/WebViewControllear.java	2021-11-05 20:22:51 UTC (rev 2584)
+++ iOSME/src/net/yura/ios/WebViewControllear.java	2021-11-09 01:05:05 UTC (rev 2585)
@@ -7,7 +7,11 @@
 import apple.uikit.UIViewController;
 import apple.uikit.enums.UIViewAutoresizing;
 import apple.webkit.WKNavigation;
+import apple.webkit.WKUserContentController;
+import apple.webkit.WKUserScript;
 import apple.webkit.WKWebView;
+import apple.webkit.WKWebViewConfiguration;
+import apple.webkit.enums.WKUserScriptInjectionTime;
 import apple.webkit.protocol.WKNavigationDelegate;
 import apple.webkit.protocol.WKUIDelegate;
 
@@ -35,7 +39,18 @@
     public void viewDidLoad() {
         super.viewDidLoad();
 
-        myWebView = WKWebView.alloc().initWithFrame(UIScreen.mainScreen().bounds());
+        // this UserScript is needed as otherwise the font is teeny tiny when the page opens, and zooming only causes side scrolling.
+        // https://stackoverflow.com/questions/26295277/wkwebview-equivalent-for-uiwebviews-scalespagetofit
+        String jScript = "var meta = document.createElement('meta'); meta.setAttribute('name', 'viewport'); meta.setAttribute('content', 'width=device-width'); document.getElementsByTagName('head')[0].appendChild(meta);";
+        WKUserScript wkUScript = WKUserScript.alloc().initWithSourceInjectionTimeForMainFrameOnly(jScript, WKUserScriptInjectionTime.End, true);
+
+        WKUserContentController wkUController = WKUserContentController.alloc().init();
+        wkUController.addUserScript(wkUScript);
+
+        WKWebViewConfiguration wkWebConfig = WKWebViewConfiguration.alloc().init();
+        wkWebConfig.setUserContentController(wkUController);
+
+        myWebView = WKWebView.alloc().initWithFrameConfiguration(UIScreen.mainScreen().bounds(), wkWebConfig);
         myWebView.setUIDelegate(this);
         myWebView.setNavigationDelegate(this);
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2584] AndroidME/src_MIDP/javax/microedition/lcdui/ game/Sprite.java

[<yu...@us...>]

Revision: 2584
          http://sourceforge.net/p/swingme/code/2584
Author:   yuranet
Date:     2021-11-05 20:22:51 +0000 (Fri, 05 Nov 2021)
Log Message:
-----------
better asserts in Sprite

Modified Paths:
--------------
    AndroidME/src_MIDP/javax/microedition/lcdui/game/Sprite.java

Modified: AndroidME/src_MIDP/javax/microedition/lcdui/game/Sprite.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/game/Sprite.java	2021-11-05 16:21:20 UTC (rev 2583)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/game/Sprite.java	2021-11-05 20:22:51 UTC (rev 2584)
@@ -79,6 +79,10 @@
         this(img, img.getWidth(), img.getHeight());
     }
 
+    /**
+     * - coming from synth (20 * 2.625) = 52.5 rounded up by XULLoader.adjustSizeToDensity to 53
+     * - coming from code (160 * 2.625)/8 = 52.5 but is not rounded up so comes in as 52
+     */
     public Sprite(Image img, int frameWidth, int frameHeight) {
         // initial state is visible, positioned at 0, 0
         // with a bound rectangle the same as the frame
@@ -88,23 +92,41 @@
         final int w = img.getWidth();
         final int h = img.getHeight();
         
-        if ( w % frameWidth != 0 || h % frameHeight != 0) {
+        if (w % frameWidth != 0 || h % frameHeight != 0) {
             // we cant throw an error here as android auto-resize of images means sizes can be slightly off
             // this happens on 1080x1920: 420dpi
             System.out.println("WARN Sprite Size w="+w+" h="+h+" frameWidth="+frameWidth+" frameHeight="+frameHeight);
         }
         this.img = img;
+
+        // frameWidth & frameWidth are rounded up as so are sizes for images android loads
+        // but they can end up bigger in the strip direction
+        // (160 * 2.625) / (20 * 2.625) = 8
+        // 420 / 52.5 = 8
+        // BUT 420 / 53 = 7.924...
+
         cols = w / frameWidth;
         rows = h / frameHeight;
+
+        // the collision rectangle
         collX = collY = 0;
         collWidth = frameWidth;
         collHeight = frameHeight;
 
+        // we used to also check: frameWidth * cols != w || frameHeight * rows != h
+        // but sometimes this is impossible to be right, as (160 * 2.625) = 420 and   20 * 8 = 160   BUT   52.5 * 8 = 420
+        // there is no correct integer value of frameWidth that could satisfy 8 cols and image width of 420
+        // so instead we make sure our values are within range and wont crash during painting
+        // 53 * 8 = 424, this is outside the (160 * 2.625) = 420 width and will crash when painting
+        if (frameWidth * cols > w || frameHeight * rows > h) {
+            throw new IllegalArgumentException("Frame Too Big for Image! fw=" + frameWidth + " fh=" + frameHeight +" w=" + w + " h=" + h);
+        }
+
         if (BuildConfig.DEBUG && Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && AndroidMeApp.targetSdkVersion >= Build.VERSION_CODES.P) {
             int rawWidth = img.getBitmap().getWidth();
             int rawHeight = img.getBitmap().getHeight();
             // check those devide exactly into cols and rows
-            if (rawWidth % cols != 0 || rawHeight % rows != 0 || w / cols != frameWidth || h / rows != frameHeight) {
+            if (rawWidth % cols != 0 || rawHeight % rows != 0) {
                 throw new IllegalArgumentException("w=" + w + " h=" + h + " fw=" + frameWidth + " fh=" + frameHeight);
             }
         }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2583] iOSME/src/net/yura/ios/CanvasView.java

[<yu...@us...>]

Revision: 2583
          http://sourceforge.net/p/swingme/code/2583
Author:   yuranet
Date:     2021-11-05 16:21:20 +0000 (Fri, 05 Nov 2021)
Log Message:
-----------
multi touch works fully on ios phones

Modified Paths:
--------------
    iOSME/src/net/yura/ios/CanvasView.java

Modified: iOSME/src/net/yura/ios/CanvasView.java
===================================================================
--- iOSME/src/net/yura/ios/CanvasView.java	2021-11-04 13:06:21 UTC (rev 2582)
+++ iOSME/src/net/yura/ios/CanvasView.java	2021-11-05 16:21:20 UTC (rev 2583)
@@ -107,6 +107,8 @@
             c++;
         }
 
+        //System.out.println("fireMultitouchEvent " + Arrays.toString(types) + " " + Arrays.toString(xs) + " " + Arrays.toString(ys));
+
         canvas.multitouchEvent(types, xs, ys);
     }
 
@@ -115,8 +117,10 @@
         super.touchesBeganWithEvent(touches, event);
 
         UITouch touch = touches.anyObject();
+        touches = event.allTouches(); // this gives us ALL current touches, even ones that are not involved in this current event, (fingers that are being still)
         CGPoint point = touch.locationInView(this);
 
+        //System.out.println("firePointerPressed(1) " + (int) point.x() + " " + (int) point.y());
         canvas.firePointerPressed((int) point.x(), (int) point.y());
 
         if (touches.count() > 1) {
@@ -129,8 +133,10 @@
         super.touchesMovedWithEvent(touches, event);
 
         UITouch touch = touches.anyObject();
+        touches = event.allTouches();
         CGPoint point = touch.locationInView(this);
 
+        //System.out.println("firePointerDragged(0) " + (int) point.x() + " " + (int) point.y());
         canvas.firePointerDragged((int)point.x(), (int)point.y());
 
         if (touches.count() > 1) {
@@ -143,6 +149,7 @@
         super.touchesEndedWithEvent(touches, event);
 
         UITouch touch = touches.anyObject();
+        touches = event.allTouches();
         CGPoint point = touch.locationInView(this);
 
         if (touches.count() > 1) {
@@ -149,6 +156,7 @@
             fireMultitouchEvent(touches, POINTER_RELEASED);
         }
 
+        //System.out.println("firePointerReleased(2) " + (int) point.x() + " " + (int) point.y());
         canvas.firePointerReleased((int) point.x(), (int) point.y());
     }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2582] SwingME/src/net/yura/mobile/gui/components/ MenuBar.java

[<yu...@us...>]

Revision: 2582
          http://sourceforge.net/p/swingme/code/2582
Author:   yuranet
Date:     2021-11-04 13:06:21 +0000 (Thu, 04 Nov 2021)
Log Message:
-----------
autoMnemonic works for menus at any location in the menubar

Modified Paths:
--------------
    SwingME/src/net/yura/mobile/gui/components/MenuBar.java

Modified: SwingME/src/net/yura/mobile/gui/components/MenuBar.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/MenuBar.java	2021-11-04 12:33:45 UTC (rev 2581)
+++ SwingME/src/net/yura/mobile/gui/components/MenuBar.java	2021-11-04 13:06:21 UTC (rev 2582)
@@ -110,9 +110,21 @@
     }
 
     void autoMnemonic() {
-        if (getSize()>0 && getElementAt(0) instanceof Menu && ((Button)getElementAt(0)).getMnemonic()==0) {
-            ((Button)getElementAt(0)).setMnemonic(KeyEvent.KEY_MENU);
+        Menu foundMenu = null;
+        for (int c = 0; c < getSize(); c++) {
+            Object visibleItem = getElementAt(c);
+            if (visibleItem instanceof Menu) {
+                if (foundMenu != null) {
+                    // there are more then 1 menu, will not auto mnemonic
+                    return;
+                }
+                foundMenu = (Menu)visibleItem;
+            }
         }
+
+        if (foundMenu != null && foundMenu.getMnemonic() == 0) {
+            foundMenu.setMnemonic(KeyEvent.KEY_MENU);
+        }
     }
 
     /**

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2581] SwingME/src/net/yura/mobile/gui/components/ MenuBar.java

[<yu...@us...>]

Revision: 2581
          http://sourceforge.net/p/swingme/code/2581
Author:   yuranet
Date:     2021-11-04 12:33:45 +0000 (Thu, 04 Nov 2021)
Log Message:
-----------
support old java still

Modified Paths:
--------------
    SwingME/src/net/yura/mobile/gui/components/MenuBar.java

Modified: SwingME/src/net/yura/mobile/gui/components/MenuBar.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/MenuBar.java	2021-11-04 12:06:41 UTC (rev 2580)
+++ SwingME/src/net/yura/mobile/gui/components/MenuBar.java	2021-11-04 12:33:45 UTC (rev 2581)
@@ -275,7 +275,6 @@
         paintDividers(g);
     }
 
-    @Override
     protected Component getComponentFor(int i, int offset) {
         Component component = super.getComponentFor(i, offset);
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2580] iOSME

[<yu...@us...>]

Revision: 2580
          http://sourceforge.net/p/swingme/code/2580
Author:   yuranet
Date:     2021-11-04 12:06:41 +0000 (Thu, 04 Nov 2021)
Log Message:
-----------
theme fix for file chooser

Modified Paths:
--------------
    iOSME/res/iOS_theme.xml
    iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java

Modified: iOSME/res/iOS_theme.xml
===================================================================
--- iOSME/res/iOS_theme.xml	2021-11-04 11:23:21 UTC (rev 2579)
+++ iOSME/res/iOS_theme.xml	2021-11-04 12:06:41 UTC (rev 2580)
@@ -206,7 +206,9 @@
     <bind style="listRenderer" key="ListRendererCollapsed"/>
     <bind style="listRenderer" key="PopupListRenderer"/>
     <bind style="listRenderer" key="MenuRenderer"/>
+    <bind style="listRenderer" key="CheckBoxRenderer"/>
 
+
     <style id="list">
       <state>
         <color type="FOREGROUND" value="#000000"/>

Modified: iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java
===================================================================
--- iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java	2021-11-04 11:23:21 UTC (rev 2579)
+++ iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java	2021-11-04 12:06:41 UTC (rev 2580)
@@ -55,35 +55,33 @@
 
         //chevron.backward chevron.forward
 
-        Style defaultStyle = getStyle("");
+        Style checkBoxRenderer = makeStyleFor("CheckBoxRenderer");
+        UIColor fileChooserIconColor = UIColor.blackColor();
 
-        Style checkBoxRenderer = new Style(defaultStyle);
-        UIColor white = UIColor.whiteColor();
-
-        Icon folderIcon = getSystemImage("folder", white); // folder.fill
+        Icon folderIcon = getSystemImage("folder", fileChooserIconColor); // folder.fill
         if (folderIcon != null) checkBoxRenderer.addProperty(folderIcon, "folderIcon", Style.ALL);
 
-        Icon imageIcon = getSystemImage("photo", white); // photo.fill
+        Icon imageIcon = getSystemImage("photo", fileChooserIconColor); // photo.fill
         if (imageIcon != null) checkBoxRenderer.addProperty(imageIcon, "imageIcon", Style.ALL);
 
-        Icon soundIcon = getSystemImage("speaker", white); // hifispeaker.fill speaker.fill
+        Icon soundIcon = getSystemImage("speaker", fileChooserIconColor); // hifispeaker.fill speaker.fill
         if (soundIcon != null) checkBoxRenderer.addProperty(soundIcon, "soundIcon", Style.ALL);
 
-        Icon videoIcon = getSystemImage("video", white); // film.fill video.fill
+        Icon videoIcon = getSystemImage("video", fileChooserIconColor); // film.fill video.fill
         if (videoIcon != null) checkBoxRenderer.addProperty(videoIcon, "videoIcon", Style.ALL);
 
-        Icon unknownIcon = getSystemImage("doc", white); // doc.fill
+        Icon unknownIcon = getSystemImage("doc", fileChooserIconColor); // doc.fill
         if (unknownIcon != null) checkBoxRenderer.addProperty(unknownIcon, "unknownIcon", Style.ALL);
 
         setStyleFor("CheckBoxRenderer", checkBoxRenderer);
 
-        Style menuItem = new Style(defaultStyle);
+        Style menuItem = makeStyleFor("MenuItem");
         Icon arrow = getSystemImage("chevron.right", null);
         if (arrow != null) menuItem.addProperty(arrow, "arrow", Style.ALL);
         setStyleFor("MenuItem", menuItem);
 
 
-        Style spinner = new Style(defaultStyle);
+        Style spinner = makeStyleFor("Spinner");
         spinner.addBorder(new EmptyBorder(0, 20, 0, 20), Style.ALL);
         UIColor blue = UIColor.systemBlueColor();
         UIColor gray = UIColor.systemGrayColor();
@@ -106,6 +104,18 @@
         // not working checkBoxRenderer.addBorder(new EmptyBorder(20,10,20,10), Style.ALL);
     }
 
+    /**
+     * @see net.yura.mobile.gui.DesktopPane#getDefaultTheme(String)
+     */
+    private Style makeStyleFor(String name) {
+        Style style = getStyle(name);
+        if (style != null) {
+            return style;
+        }
+        Style defaultStyle = getStyle("");
+        return new Style(defaultStyle);
+    }
+
     private static Icon getSystemImage(String name, UIColor color) {
         UIImage image;
         try {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2579] SwingME/src/net/yura/mobile/gui/components

[<yu...@us...>]

Revision: 2579
          http://sourceforge.net/p/swingme/code/2579
Author:   yuranet
Date:     2021-11-04 11:23:21 +0000 (Thu, 04 Nov 2021)
Log Message:
-----------
glue component in menu bar

Modified Paths:
--------------
    SwingME/src/net/yura/mobile/gui/components/FileChooser.java
    SwingME/src/net/yura/mobile/gui/components/MenuBar.java

Modified: SwingME/src/net/yura/mobile/gui/components/FileChooser.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/FileChooser.java	2021-11-03 21:48:50 UTC (rev 2578)
+++ SwingME/src/net/yura/mobile/gui/components/FileChooser.java	2021-11-04 11:23:21 UTC (rev 2579)
@@ -124,9 +124,18 @@
         setMenuBar(bar);
         // we need to add it to the window before we add the buttons so they get
         // auto softkey assigned
-        bar.add(popupMenu);
-        bar.add(close);
 
+        if (Midlet.getPlatform() == Midlet.PLATFORM_IOS || Midlet.getPlatform() == Midlet.PLATFORM_ANDROID) {
+            bar.add(close);
+            bar.addGlue();
+            bar.add(popupMenu);
+        }
+        else {
+            bar.add(popupMenu);
+            bar.addGlue();
+            bar.add(close);
+        }
+
         files = new Vector(0);
         lastFewImages = new Vector();
         thumbOptionRenderer = new SelectableFileRenderer();

Modified: SwingME/src/net/yura/mobile/gui/components/MenuBar.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/MenuBar.java	2021-11-03 21:48:50 UTC (rev 2578)
+++ SwingME/src/net/yura/mobile/gui/components/MenuBar.java	2021-11-04 11:23:21 UTC (rev 2579)
@@ -18,10 +18,8 @@
 package net.yura.mobile.gui.components;
 
 import java.util.Vector;
-
 import javax.microedition.lcdui.Canvas;
 import javax.microedition.lcdui.Graphics;
-
 import net.yura.mobile.gui.ActionListener;
 import net.yura.mobile.gui.DesktopPane;
 import net.yura.mobile.gui.Graphics2D;
@@ -95,10 +93,20 @@
 
         // hack to make menu items have left alignment
         if (button instanceof Button && button.getName().equals("Button")){
-            ((Button)button).setName("MenuItem");
+            button.setName("MenuItem");
             ((Button)button).setHorizontalAlignment(Graphics.LEFT);
         }
+    }
 
+    /**
+     * @see javax.swing.Box#createHorizontalGlue()
+     * @see javax.swing.Box#createVerticalGlue()
+     */
+    public void addGlue() {
+        Label glue = new Label();
+        // we do not have maximum size property on components, so we just need to give it a unique identifier
+        glue.setName("Glue");
+        add(glue);
     }
 
     void autoMnemonic() {
@@ -267,6 +275,25 @@
         paintDividers(g);
     }
 
+    @Override
+    protected Component getComponentFor(int i, int offset) {
+        Component component = super.getComponentFor(i, offset);
+
+        if ("Glue".equals(component.getName())) {
+            int sizeComponentsAfterGlue = 0;
+            for(int c = (i + 1); c < getSize(); c++){
+                Component comp = super.getComponentFor(c, offset); // offset can be anything here as we are not using it
+                sizeComponentsAfterGlue = sizeComponentsAfterGlue + ((getLayoutOrientation() == HORIZONTAL) ? comp.getWidthWithBorder() : comp.getHeightWithBorder());
+            }
+            component.setSize(
+                     (getLayoutOrientation() == HORIZONTAL) ? (getWidth() - offset - sizeComponentsAfterGlue) : component.getWidth(),
+                     (getLayoutOrientation() == VERTICAL) ? (getHeight() - offset - sizeComponentsAfterGlue) : component.getHeight()
+            );
+        }
+
+        return component;
+    }
+
     private boolean isFrameMenuBar() {
         Window w = getWindow();
         return (w instanceof Frame && ((Frame)w).getMenuBar() == this );

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2578] iOSME/res/iOS_theme.xml

[<yu...@us...>]

Revision: 2578
          http://sourceforge.net/p/swingme/code/2578
Author:   yuranet
Date:     2021-11-03 21:48:50 +0000 (Wed, 03 Nov 2021)
Log Message:
-----------
disabled menu items

Modified Paths:
--------------
    iOSME/res/iOS_theme.xml

Modified: iOSME/res/iOS_theme.xml
===================================================================
--- iOSME/res/iOS_theme.xml	2021-11-03 18:23:13 UTC (rev 2577)
+++ iOSME/res/iOS_theme.xml	2021-11-03 21:48:50 UTC (rev 2578)
@@ -198,6 +198,9 @@
         <color type="BORDERFILL" value="#3b78e6"/>
         <color type="BACKGROUND" value="#00000000"/>
       </state>
+      <state value="DISABLED">
+        <color type="FOREGROUND" value="#7F7F7F"/>
+      </state>
     </style>
     <bind style="listRenderer" key="ListRenderer"/>
     <bind style="listRenderer" key="ListRendererCollapsed"/>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2577] SwingME/src/net/yura/mobile/gui/components/ FileChooser.java

[<yu...@us...>]

Revision: 2577
          http://sourceforge.net/p/swingme/code/2577
Author:   yuranet
Date:     2021-11-03 18:23:13 +0000 (Wed, 03 Nov 2021)
Log Message:
-----------
make it easier to click on items in file chooser

Modified Paths:
--------------
    SwingME/src/net/yura/mobile/gui/components/FileChooser.java

Modified: SwingME/src/net/yura/mobile/gui/components/FileChooser.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/FileChooser.java	2021-11-03 17:10:44 UTC (rev 2576)
+++ SwingME/src/net/yura/mobile/gui/components/FileChooser.java	2021-11-03 18:23:13 UTC (rev 2577)
@@ -154,8 +154,15 @@
             fileTable.setRowHeight( thumbSize + 5 ); // some padding
         }
         else {
-            thumbSize = thumbOptionRenderer.getFont().getHeight();
-            fileList.setFixedCellHeight( thumbSize + 6 ); // some padding
+            int extraPadding = 6; // some padding
+            int rowHeight = thumbOptionRenderer.getFont().getHeight() + extraPadding;
+
+            if (rowHeight < getDesktopPane().minimumTouchTarget) {
+                rowHeight = getDesktopPane().minimumTouchTarget;
+            }
+
+            thumbSize = rowHeight - extraPadding;
+            fileList.setFixedCellHeight(rowHeight);
         }
     }
     private void calcHardImages() {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2576] SwingME/src/net/yura/mobile/gui/components/ TextPane.java

[<yu...@us...>]

Revision: 2576
          http://sourceforge.net/p/swingme/code/2576
Author:   yuranet
Date:     2021-11-03 17:10:44 +0000 (Wed, 03 Nov 2021)
Log Message:
-----------
allow link click even if no action listoner set

Modified Paths:
--------------
    SwingME/src/net/yura/mobile/gui/components/TextPane.java

Modified: SwingME/src/net/yura/mobile/gui/components/TextPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/TextPane.java	2021-11-03 16:17:20 UTC (rev 2575)
+++ SwingME/src/net/yura/mobile/gui/components/TextPane.java	2021-11-03 17:10:44 UTC (rev 2576)
@@ -338,7 +338,7 @@
     public void processMouseEvent(int type, int x, int y, KeyEvent keys) {
         super.processMouseEvent(type, x, y, keys);
 
-        if (type == DesktopPane.PRESSED && actionListener != null && isFocusOwner()) {
+        if (type == DesktopPane.PRESSED && isFocusOwner()) {
             for (int i = 0; i < lineFragments.size(); i++) {
                 LineFragment frag = (LineFragment) lineFragments.elementAt(i);
                 if (x >= frag.x && x <= frag.x + frag.w &&
@@ -379,7 +379,9 @@
                 repaint();
             }
 
-            actionListener.actionPerformed(style.getAction());
+            if (actionListener != null) {
+                actionListener.actionPerformed(style.getAction());
+            }
             return true;
         }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2575] SwingME/src/net/yura/mobile/gui/cellrenderer/ MenuItemRenderer.java

[<yu...@us...>]

Revision: 2575
          http://sourceforge.net/p/swingme/code/2575
Author:   yuranet
Date:     2021-11-03 16:17:20 +0000 (Wed, 03 Nov 2021)
Log Message:
-----------
avoid double extra padding

Modified Paths:
--------------
    SwingME/src/net/yura/mobile/gui/cellrenderer/MenuItemRenderer.java

Modified: SwingME/src/net/yura/mobile/gui/cellrenderer/MenuItemRenderer.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/cellrenderer/MenuItemRenderer.java	2021-11-03 15:05:29 UTC (rev 2574)
+++ SwingME/src/net/yura/mobile/gui/cellrenderer/MenuItemRenderer.java	2021-11-03 16:17:20 UTC (rev 2575)
@@ -52,6 +52,7 @@
     }
 
     protected void workoutMinimumSize() {
+        component.setBorder(getBorder()); // we do not draw the border of the actual item, but its needed to work out the size
         component.workoutPreferredSize();
         width = component.getWidth();
         height = component.getHeight();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2574] SwingME/src/net/yura/mobile/gui

[<yu...@us...>]

Revision: 2574
          http://sourceforge.net/p/swingme/code/2574
Author:   yuranet
Date:     2021-11-03 15:05:29 +0000 (Wed, 03 Nov 2021)
Log Message:
-----------
update for new android, and allow menubar to shrink again

Modified Paths:
--------------
    SwingME/src/net/yura/mobile/gui/DesktopPane.java
    SwingME/src/net/yura/mobile/gui/components/MenuBar.java

Modified: SwingME/src/net/yura/mobile/gui/DesktopPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/DesktopPane.java	2021-11-03 14:27:40 UTC (rev 2573)
+++ SwingME/src/net/yura/mobile/gui/DesktopPane.java	2021-11-03 15:05:29 UTC (rev 2574)
@@ -197,8 +197,8 @@
         int platform = Midlet.getPlatform();
 
         SOFT_KEYS = platform != Midlet.PLATFORM_ME4SE && platform != Midlet.PLATFORM_ANDROID && platform != Midlet.PLATFORM_IOS && platform != Midlet.PLATFORM_BLACKBERRY;
-        HIDDEN_MENU = platform == Midlet.PLATFORM_ANDROID || platform == Midlet.PLATFORM_BLACKBERRY;
-        HIDDEN_BACK = platform == Midlet.PLATFORM_ANDROID || platform == Midlet.PLATFORM_BLACKBERRY;
+        HIDDEN_MENU = platform == Midlet.PLATFORM_BLACKBERRY;
+        HIDDEN_BACK = platform == Midlet.PLATFORM_BLACKBERRY;
 
         VERY_BIG_SCREEN = platform == Midlet.PLATFORM_ME4SE;
         MAX_CLOSE_BUTTONS = platform == Midlet.PLATFORM_ME4SE;

Modified: SwingME/src/net/yura/mobile/gui/components/MenuBar.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/MenuBar.java	2021-11-03 14:27:40 UTC (rev 2573)
+++ SwingME/src/net/yura/mobile/gui/components/MenuBar.java	2021-11-03 15:05:29 UTC (rev 2574)
@@ -314,14 +314,12 @@
 
     protected void workoutMinimumSize() {
 
-        DesktopPane dp = getDesktopPane();
-
         // in softkey mode if the bar is at the bottom of a window
         // we do not want it getting focus when we click on it
         // unless we have something focusable in it, but thats rare
         // TODO, if we mix focuable AND softkeys, this will make the
         // menu bar draw over the top of the softkeys, should not.
-        if (dp.SOFT_KEYS && isFrameMenuBar() ) {
+        if (isFrameMenuBar()) {
             boolean focus=false;
             int size = getSize();
             for(int i = 0; i < size; i++){

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2573] AndroidME/src_SwingME_plaf/net/yura/android/ plaf/AndroidLookAndFeel.java

[<yu...@us...>]

Revision: 2573
          http://sourceforge.net/p/swingme/code/2573
Author:   yuranet
Date:     2021-11-03 14:27:40 +0000 (Wed, 03 Nov 2021)
Log Message:
-----------
support edge to edge hidden api

Modified Paths:
--------------
    AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java

Modified: AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java
===================================================================
--- AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java	2021-11-03 12:30:44 UTC (rev 2572)
+++ AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java	2021-11-03 14:27:40 UTC (rev 2573)
@@ -3,6 +3,7 @@
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.ColorStateList;
+import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.Config;
@@ -715,15 +716,49 @@
             }
     }
 
-    @TargetApi(14)
-    static void sortoutMenu() {
+    private static void sortoutMenu() {
+        DesktopPane dp = DesktopPane.getDesktopPane();
+
+        // first we set to the default used by OLD android phones, then we will override with modern API calls
+        dp.HIDDEN_BACK = true;
         try {
-            DesktopPane dp = DesktopPane.getDesktopPane();
-            dp.HIDDEN_BACK = !"BlackBerry".equals(Build.BRAND);
-            
+            if ("BlackBerry".equals(Build.BRAND)) {
+                dp.HIDDEN_BACK = false;
+            }
+            if (isEdgeToEdgeEnabled(AndroidMeActivity.DEFAULT_ACTIVITY) == 2) {
+                dp.HIDDEN_BACK = false;
+            }
+        }
+        catch (Throwable error) {
+            error.printStackTrace(System.out);
+        }
+
+        dp.HIDDEN_MENU = true;
+        try {
             // API-14
-            dp.HIDDEN_MENU = ViewConfiguration.get( AndroidMeActivity.DEFAULT_ACTIVITY ).hasPermanentMenuKey();
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
+                dp.HIDDEN_MENU = ViewConfiguration.get(AndroidMeActivity.DEFAULT_ACTIVITY).hasPermanentMenuKey();
+            }
         }
-        catch (Throwable ignored) { }
+        catch (Throwable error) {
+            error.printStackTrace(System.out);
+        }
     }
+
+    /**
+     * from: https://stackoverflow.com/questions/56689210/how-to-detect-full-screen-gesture-mode-in-android-10/60733427#60733427
+     * aparently this does not always work, but so far its the best we got
+     *
+     *     0 : Navigation is displaying with 3 buttons
+     *     1 : Navigation is displaying with 2 button(Android P navigation mode)
+     *     2 : Full screen gesture(Gesture on android Q)
+     */
+    private static int isEdgeToEdgeEnabled(Context context) {
+        Resources resources = context.getResources();
+        int resourceId = resources.getIdentifier("config_navBarInteractionMode", "integer", "android");
+        if (resourceId > 0) {
+            return resources.getInteger(resourceId);
+        }
+        return 0;
+    }
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2572] AndroidME/src_SwingME_plaf/net/yura/android/ plaf/AndroidSprite.java

[<yu...@us...>]

Revision: 2572
          http://sourceforge.net/p/swingme/code/2572
Author:   yuranet
Date:     2021-11-03 12:30:44 +0000 (Wed, 03 Nov 2021)
Log Message:
-----------
fix to AndroidSprite for ever changing android api

Modified Paths:
--------------
    AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidSprite.java

Modified: AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidSprite.java
===================================================================
--- AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidSprite.java	2021-11-02 20:12:41 UTC (rev 2571)
+++ AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidSprite.java	2021-11-03 12:30:44 UTC (rev 2572)
@@ -2,22 +2,49 @@
 
 import javax.microedition.lcdui.Graphics;
 import javax.microedition.lcdui.game.Sprite;
-
+import android.graphics.drawable.Animatable;
 import android.graphics.drawable.AnimationDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.RotateDrawable;
 
-public class AndroidSprite extends Sprite {
+public class AndroidSprite extends Sprite implements Drawable.Callback {
 
     Drawable spin;
+    Runnable runnable;
     int frame;
 
     public AndroidSprite(Drawable d, int w, int h) {
         super(w > 1 ? w : d.getIntrinsicWidth(), h > 1 ? h : d.getIntrinsicHeight());
         spin = d;
+
+        if (spin instanceof Animatable) {
+            // we call this to get the runnable through the Drawable.Callback interface methods
+            spin.setCallback(this);
+            ((Animatable) spin).start();
+            ((Animatable) spin).stop();
+        }
+        if (spin instanceof Runnable) {
+            runnable = (Runnable)spin;
+        }
     }
 
+    // this is called by run
     @Override
+    public void invalidateDrawable(Drawable who) {
+    }
+
+    // this is called by nextframe (that is called by start AND run)
+    @Override
+    public void scheduleDrawable(Drawable who, Runnable what, long when) {
+        runnable = what;
+    }
+
+    // this is called by stop AND run
+    @Override
+    public void unscheduleDrawable(Drawable who, Runnable what) {
+    }
+
+    @Override
     public void paint(Graphics g) {
         Drawable draw;
 
@@ -24,21 +51,22 @@
         if (spin instanceof AnimationDrawable) {
             draw = ((AnimationDrawable)spin).getFrame(frame);
         }
-//      else if (spin.getClass().getName().equals("android.graphics.drawable.AnimatedRotateDrawable")) {
+        else if (spin instanceof RotateDrawable) {
+            spin.setLevel( frame*10000/getFrameSequenceLength() );
+            draw = spin;
+        }
+        else if (spin instanceof Runnable || spin instanceof Animatable) {
+            draw = spin;
+        }
+        // for now, we don't need this hack
+//      else if ("android.graphics.drawable.AnimatedRotateDrawable".equals(spin.getClass().getName())) {
 //          int totalFrame = getFrameSequenceLength();
 //          canvas.rotate((frame*360)/totalFrame, x+width/2, y+height/2);
 //          draw = spin;
 //      }
-        else if (spin instanceof Runnable) {
-            draw = spin;
-        }
-        else if (spin instanceof RotateDrawable) {
-            spin.setLevel( frame*10000/getFrameSequenceLength() );
-            draw = spin;
-        }
         else {
             draw = spin;
-            System.out.println("DO NOT KNOW HOW TO DRAW "+spin);
+            System.out.println("DO NOT KNOW HOW TO DRAW " + spin);
         }
 
         android.graphics.Canvas canvas = g.getCanvas();
@@ -56,9 +84,6 @@
         if (spin instanceof AnimationDrawable) {
             return ((AnimationDrawable)spin).getNumberOfFrames();
         }
-//      if (spin.getClass().getName().equals("android.graphics.drawable.AnimatedRotateDrawable")) {
-//          return 12;
-//      }
         if (spin instanceof Runnable) {
             return 12; // Android default implementation value.
         }
@@ -65,6 +90,14 @@
         if (spin instanceof RotateDrawable) {
             return 12; // a guess, this is used by the SE Xperia X10 Android 1.6 by the inverted spinner
         }
+        if (spin instanceof Animatable) {
+            return 12; // the default for android.graphics.drawable.AnimatedRotateDrawable
+        }
+        if ("android.graphics.drawable.AnimatedRotateDrawable".equals(spin.getClass().getName())) {
+            return 12; // they have changed the interface this class uses so many times that we should really just check the class
+        }
+
+        System.out.println("DO NOT KNOW HOW TO getFrameSequenceLength "+spin);
         return 1; // we do not know how to animate this, so it only has 1 frame
     }
 
@@ -78,7 +111,7 @@
             // HACK 1: android.graphics.drawable.AnimatedRotateDrawable class implements
             // Runnable. Calling run() will make it rotate one position. We are
             // ignoring the requesting frame, but that is OK for a spinner.
-            if (spin instanceof Runnable) {
+            if (runnable != null) {
 
                 // HACK 2: The same Sprite is shared between animations, and the "newFrame"
                 // sequence of each of animation is independent, we need to somehow respond
@@ -93,12 +126,12 @@
                 if (newFrame == nextFrame || (now - lastSetFrameTime) > 100) {
                     frame = newFrame;
 
-                    ((Runnable) spin).run();
+                    runnable.run();
                     lastSetFrameTime = now;
                 }
             }
             else {
-        	frame = newFrame;
+                frame = newFrame;
             }
         }
     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2571] iOSME

[<yu...@us...>]

Revision: 2571
          http://sourceforge.net/p/swingme/code/2571
Author:   yuranet
Date:     2021-11-02 20:12:41 +0000 (Tue, 02 Nov 2021)
Log Message:
-----------
dim color set in ios theme

Modified Paths:
--------------
    iOSME/res/iOS_theme.xml
    iOSME/src/javax/microedition/lcdui/game/Sprite.java

Modified: iOSME/res/iOS_theme.xml
===================================================================
--- iOSME/res/iOS_theme.xml	2021-11-02 18:18:27 UTC (rev 2570)
+++ iOSME/res/iOS_theme.xml	2021-11-02 20:12:41 UTC (rev 2571)
@@ -51,7 +51,7 @@
     <bind style="text" key="TextField"/>
     <bind style="text" key="TextArea"/>
 
-    <style id="window">
+    <style id="frame">
       <insets top="0" left="0" bottom="0" right="0"/>
       <state>
           <color type="BACKGROUND" value="#F2F2F7"/>
@@ -58,8 +58,16 @@
           <color type="FOREGROUND" value="#52425c"/>
       </state>
     </style>
-    <bind style="window" key="Frame"/>
+    <bind style="frame" key="Frame"/>
 
+    <style id="window">
+        <state>
+            <color id="dim_color" value="#AA000000"/>
+            <property key="dim" value="dim_color"/>
+        </state>
+    </style>
+    <bind style="window" key="Window"/>
+
     <style id="dialog">
       <insets top="15" left="15" bottom="20" right="20"/>
       <state>

Modified: iOSME/src/javax/microedition/lcdui/game/Sprite.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/game/Sprite.java	2021-11-02 18:18:27 UTC (rev 2570)
+++ iOSME/src/javax/microedition/lcdui/game/Sprite.java	2021-11-02 20:12:41 UTC (rev 2571)
@@ -280,7 +280,7 @@
     public void setFrame(int frame) {
         int l = (sequence == null)? rows*cols : sequence.length;
         if (frame < 0 || frame >= l) {
-            throw new IndexOutOfBoundsException();
+            throw new IndexOutOfBoundsException(frame + " is >= " + l);
         }
         this.frame = frame;
     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2570] SwingME/src/net/yura/mobile/gui

[<yu...@us...>]

Revision: 2570
          http://sourceforge.net/p/swingme/code/2570
Author:   yuranet
Date:     2021-11-02 18:18:27 +0000 (Tue, 02 Nov 2021)
Log Message:
-----------
minimum touch size added

Modified Paths:
--------------
    SwingME/src/net/yura/mobile/gui/DesktopPane.java
    SwingME/src/net/yura/mobile/gui/border/MatteBorder.java
    SwingME/src/net/yura/mobile/gui/components/Component.java
    SwingME/src/net/yura/mobile/gui/components/ScrollPane.java
    SwingME/src/net/yura/mobile/gui/plaf/SynthLookAndFeel.java

Modified: SwingME/src/net/yura/mobile/gui/DesktopPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/DesktopPane.java	2021-11-02 11:55:01 UTC (rev 2569)
+++ SwingME/src/net/yura/mobile/gui/DesktopPane.java	2021-11-02 18:18:27 UTC (rev 2570)
@@ -37,6 +37,7 @@
 import net.yura.mobile.gui.components.TextComponent;
 import net.yura.mobile.gui.components.ToolTip;
 import net.yura.mobile.gui.components.Window;
+import net.yura.mobile.gui.layout.XULLoader;
 import net.yura.mobile.gui.plaf.LookAndFeel;
 import net.yura.mobile.gui.plaf.Style;
 import net.yura.mobile.logging.Logger;
@@ -144,11 +145,15 @@
     public boolean HIDDEN_BACK;
     public boolean DEFAULT_NO_FOCUS;
 
+    public int inaccuracy;
+    public int minimumTouchTarget;
+    public int defaultSpace; // the padding between components
+    private int menuHeight; // (soft key area) comes from the renderer, so depends on the theme
+
     // object variables
     protected Midlet midlet;
     private LookAndFeel theme;
-    public int defaultSpace;
-    private int menuHeight;
+
     final private Vector windows = new Vector();
     final private Object uiLock = windows;
     //private Window currentWindow;
@@ -168,7 +173,7 @@
     private Component nextAnimatedComponent;
     private Image splash;
     private int background;
-    private Object fade;
+    private Object fade; // can be color or icon
     private boolean paintdone;
     private boolean fullrepaint;
     private boolean killflag;
@@ -175,7 +180,6 @@
     private boolean wideScreen;
     private boolean sideSoftKeys;
     private byte[] message;
-    public int inaccuracy;
 
     // this is the currently focused component in the whole system
     // each window also has its own focused component
@@ -244,7 +248,6 @@
         UIManager.put("pasteText", "Paste");
         UIManager.put("deleteText", "Delete");
         UIManager.put("selectAllText", "Select All");
-
     }
 
     public final void run() {
@@ -385,12 +388,13 @@
         clear2.addBackground(Style.NO_COLOR, Style.ALL);
         theme.setStyleFor("TabScroll", clear2);
 
-        // TODO this should be combined with the XULLoader#adjustSizeToDensity method
+        // padding is related to screen size, and NOT the density
         if (defaultSpace == 0) {
             int maxSize = Math.max(getWidth(), getHeight());
             defaultSpace = (maxSize <= 128) ? 3 : (maxSize <= 208) ? 5 : 7;
         }
 
+        minimumTouchTarget = (Midlet.getPlatform() == Midlet.PLATFORM_IOS || Midlet.getPlatform() == Midlet.PLATFORM_ANDROID) ? XULLoader.adjustSizeToDensity(44) : 0;
 
         // this is only needed for if SOFT_KEYS is true,
         // but we may wish to set it to true after we set the look and feel
@@ -425,7 +429,6 @@
         }
 
         fade = getDefaultTheme(dummy).getProperty("dim", Style.ALL);
-
     }
 
     /**

Modified: SwingME/src/net/yura/mobile/gui/border/MatteBorder.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/border/MatteBorder.java	2021-11-02 11:55:01 UTC (rev 2569)
+++ SwingME/src/net/yura/mobile/gui/border/MatteBorder.java	2021-11-02 18:18:27 UTC (rev 2570)
@@ -125,7 +125,7 @@
                 boolean nothing = insets[c] == 0 || (insets[c] >> 24 & 0xFF) < 10; // check alpha is less then 10
 
 //System.out.print(nothing ? " " : "#");
-//System.out.print(insets[c]);
+//System.out.print(Integer.toHexString(insets[c]));
 
                 if (nothing && result[1]==0) {
                     result[0] = c+1;

Modified: SwingME/src/net/yura/mobile/gui/components/Component.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Component.java	2021-11-02 11:55:01 UTC (rev 2569)
+++ SwingME/src/net/yura/mobile/gui/components/Component.java	2021-11-02 18:18:27 UTC (rev 2570)
@@ -584,6 +584,17 @@
             workoutMinimumSize();
         //}
 
+        if ((getCurrentState() & Style.DISABLED) == 0) {
+            int minimumTouchTarget = getDesktopPane().minimumTouchTarget;
+            Border insets = getInsets();
+            if (getWidthWithBorder() < minimumTouchTarget) {
+                width = minimumTouchTarget - insets.getLeft() - insets.getRight();
+            }
+            if (getHeightWithBorder() < minimumTouchTarget) {
+                height = minimumTouchTarget - insets.getTop() - insets.getBottom();
+            }
+        }
+
         if (preferredWidth!=-1) {
             width = preferredWidth;
         }

Modified: SwingME/src/net/yura/mobile/gui/components/ScrollPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/ScrollPane.java	2021-11-02 11:55:01 UTC (rev 2569)
+++ SwingME/src/net/yura/mobile/gui/components/ScrollPane.java	2021-11-02 18:18:27 UTC (rev 2570)
@@ -71,6 +71,7 @@
 
         slider = new Slider();
         slider.setName("ScrollBar");
+        slider.setFocusable(false);
 
         setMode(m);
     }

Modified: SwingME/src/net/yura/mobile/gui/plaf/SynthLookAndFeel.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/plaf/SynthLookAndFeel.java	2021-11-02 11:55:01 UTC (rev 2569)
+++ SwingME/src/net/yura/mobile/gui/plaf/SynthLookAndFeel.java	2021-11-02 18:18:27 UTC (rev 2570)
@@ -55,6 +55,8 @@
     protected Border getBorder(String path) {
         Image in = createImage(path);
         if (in != null) { // failed to find image
+
+//            System.out.println("LOADING.... " + path);
             return MatteBorder.load9png( in ); // load 9 pacth
         }
         return null;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2569] SwingME/src/net/yura/mobile/gui/components

[<yu...@us...>]

Revision: 2569
          http://sourceforge.net/p/swingme/code/2569
Author:   yuranet
Date:     2021-11-02 11:55:01 +0000 (Tue, 02 Nov 2021)
Log Message:
-----------
theme fix for ProgressBar

Modified Paths:
--------------
    SwingME/src/net/yura/mobile/gui/components/FileChooser.java
    SwingME/src/net/yura/mobile/gui/components/ProgressBar.java

Modified: SwingME/src/net/yura/mobile/gui/components/FileChooser.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/FileChooser.java	2021-11-01 18:11:26 UTC (rev 2568)
+++ SwingME/src/net/yura/mobile/gui/components/FileChooser.java	2021-11-02 11:55:01 UTC (rev 2569)
@@ -291,7 +291,7 @@
 
     private void startFileLoadingThread() {
         this.files.removeAllElements();
-        new Thread(this).start();
+        new Thread(this, "File-Chooser").start();
     }
 
     private void startImageLoadingThread(SelectableFile file) {
@@ -408,7 +408,7 @@
       }
       catch(Throwable t) {
             //#debug warn
-            Logger.warn("faital error in FileChooser thread", t);
+            Logger.warn("fatal error in FileChooser thread", t);
       }
     }
 

Modified: SwingME/src/net/yura/mobile/gui/components/ProgressBar.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/ProgressBar.java	2021-11-01 18:11:26 UTC (rev 2568)
+++ SwingME/src/net/yura/mobile/gui/components/ProgressBar.java	2021-11-02 11:55:01 UTC (rev 2569)
@@ -41,7 +41,11 @@
      */
     public ProgressBar() {
             focusable = false;
-            loaded = 100;
+
+            // set the default value to 100, but only if it has not been already set by the theme (super constructor -> updateUI)
+            if (loaded == 0) {
+                loaded = 100;
+            }
     }
 
     public ProgressBar(Sprite sp) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2568] iOSME/src/net/yura/ios/WebViewControllear.java

[<yu...@us...>]

Revision: 2568
          http://sourceforge.net/p/swingme/code/2568
Author:   yuranet
Date:     2021-11-01 18:11:26 +0000 (Mon, 01 Nov 2021)
Log Message:
-----------
rotate fix

Modified Paths:
--------------
    iOSME/src/net/yura/ios/WebViewControllear.java

Modified: iOSME/src/net/yura/ios/WebViewControllear.java
===================================================================
--- iOSME/src/net/yura/ios/WebViewControllear.java	2021-11-01 17:28:49 UTC (rev 2567)
+++ iOSME/src/net/yura/ios/WebViewControllear.java	2021-11-01 18:11:26 UTC (rev 2568)
@@ -5,6 +5,7 @@
 import apple.foundation.NSURL;
 import apple.uikit.UIScreen;
 import apple.uikit.UIViewController;
+import apple.uikit.enums.UIViewAutoresizing;
 import apple.webkit.WKNavigation;
 import apple.webkit.WKWebView;
 import apple.webkit.protocol.WKNavigationDelegate;
@@ -37,6 +38,10 @@
         myWebView = WKWebView.alloc().initWithFrame(UIScreen.mainScreen().bounds());
         myWebView.setUIDelegate(this);
         myWebView.setNavigationDelegate(this);
+
+        // support screen rotation
+        myWebView.setAutoresizingMask(UIViewAutoresizing.FlexibleWidth | UIViewAutoresizing.FlexibleHeight);
+
         view().addSubview(myWebView);
 
         openURL(url);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2567] iOSME/src/net/yura/ios/AppController.java

[<yu...@us...>]

Revision: 2567
          http://sourceforge.net/p/swingme/code/2567
Author:   yuranet
Date:     2021-11-01 17:28:49 +0000 (Mon, 01 Nov 2021)
Log Message:
-----------
iPhone x fix for keyboad padding

Modified Paths:
--------------
    iOSME/src/net/yura/ios/AppController.java

Modified: iOSME/src/net/yura/ios/AppController.java
===================================================================
--- iOSME/src/net/yura/ios/AppController.java	2021-11-01 17:20:01 UTC (rev 2566)
+++ iOSME/src/net/yura/ios/AppController.java	2021-11-01 17:28:49 UTC (rev 2567)
@@ -13,6 +13,7 @@
 import apple.foundation.NSNotificationCenter;
 import apple.foundation.NSValue;
 import apple.uikit.NSLayoutConstraint;
+import apple.uikit.UIApplication;
 import apple.uikit.UIColor;
 import apple.uikit.UIView;
 import apple.uikit.UIViewController;
@@ -48,8 +49,7 @@
 
     @Selector("keyboardWillShow:")
     public void keyboardWillShow(NSNotification notification) {
-        double keyboardHeight = ((NSValue)notification.userInfo().get(UIKit.UIKeyboardFrameEndUserInfoKey())).CGRectValue().size().height();
-        setAdditionalSafeAreaInsets(new UIEdgeInsets(0, 0, keyboardHeight, 0));
+        setAdditionalSafeAreaInsets(new UIEdgeInsets(0, 0, getAdditionalSafeAreaBottom(notification), 0));
     }
 
     @Selector("keyboardWillHide:")
@@ -59,8 +59,13 @@
 
     @Selector("keyboardWillChange:")
     public void keyboardWillChange(NSNotification notification) {
+        setAdditionalSafeAreaInsets(new UIEdgeInsets(0, 0, getAdditionalSafeAreaBottom(notification), 0));
+    }
+
+    private double getAdditionalSafeAreaBottom(NSNotification notification) {
         double keyboardHeight = ((NSValue)notification.userInfo().get(UIKit.UIKeyboardFrameEndUserInfoKey())).CGRectValue().size().height();
-        setAdditionalSafeAreaInsets(new UIEdgeInsets(0, 0, keyboardHeight, 0));
+        double bottomPadding = UIApplication.sharedApplication().keyWindow().safeAreaInsets().bottom();
+        return keyboardHeight - bottomPadding;
     }
 
     @Override

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2566] iOSME/src/net/yura/ios

[<yu...@us...>]

Revision: 2566
          http://sourceforge.net/p/swingme/code/2566
Author:   yuranet
Date:     2021-11-01 17:20:01 +0000 (Mon, 01 Nov 2021)
Log Message:
-----------
keyboard show and hide resizes the screen

Modified Paths:
--------------
    iOSME/src/net/yura/ios/AppController.java
    iOSME/src/net/yura/ios/NativeTextEntry.java

Modified: iOSME/src/net/yura/ios/AppController.java
===================================================================
--- iOSME/src/net/yura/ios/AppController.java	2021-11-01 15:46:24 UTC (rev 2565)
+++ iOSME/src/net/yura/ios/AppController.java	2021-11-01 17:20:01 UTC (rev 2566)
@@ -1,6 +1,8 @@
 package net.yura.ios;
 
 import org.moe.natj.general.Pointer;
+import org.moe.natj.objc.SEL;
+import org.moe.natj.objc.ann.Selector;
 import javax.microedition.lcdui.Canvas;
 import javax.microedition.lcdui.Display;
 import javax.microedition.lcdui.Displayable;
@@ -7,11 +9,16 @@
 import javax.microedition.midlet.MIDlet;
 import apple.foundation.NSArray;
 import apple.foundation.NSDictionary;
+import apple.foundation.NSNotification;
+import apple.foundation.NSNotificationCenter;
+import apple.foundation.NSValue;
 import apple.uikit.NSLayoutConstraint;
 import apple.uikit.UIColor;
 import apple.uikit.UIView;
 import apple.uikit.UIViewController;
+import apple.uikit.c.UIKit;
 import apple.uikit.enums.UIStatusBarStyle;
+import apple.uikit.struct.UIEdgeInsets;
 
 public class AppController extends UIViewController {
 
@@ -30,10 +37,32 @@
     public void viewDidLoad() {
         super.viewDidLoad();
 
+        NSNotificationCenter notificationCenter = NSNotificationCenter.defaultCenter();
+        notificationCenter.addObserverSelectorNameObject(this, new SEL("keyboardWillShow:"), UIKit.UIKeyboardWillShowNotification(), null);
+        notificationCenter.addObserverSelectorNameObject(this, new SEL("keyboardWillHide:"), UIKit.UIKeyboardWillHideNotification(), null);
+        notificationCenter.addObserverSelectorNameObject(this, new SEL("keyboardWillChange:"), UIKit.UIKeyboardWillChangeFrameNotification(), null);
+
         Display display = Display.getDisplay(MIDlet.DEFAULT_MIDLET);
         display.setController(this);
     }
 
+    @Selector("keyboardWillShow:")
+    public void keyboardWillShow(NSNotification notification) {
+        double keyboardHeight = ((NSValue)notification.userInfo().get(UIKit.UIKeyboardFrameEndUserInfoKey())).CGRectValue().size().height();
+        setAdditionalSafeAreaInsets(new UIEdgeInsets(0, 0, keyboardHeight, 0));
+    }
+
+    @Selector("keyboardWillHide:")
+    public void keyboardWillHide(NSNotification notification) {
+        setAdditionalSafeAreaInsets(UIKit.UIEdgeInsetsZero());
+    }
+
+    @Selector("keyboardWillChange:")
+    public void keyboardWillChange(NSNotification notification) {
+        double keyboardHeight = ((NSValue)notification.userInfo().get(UIKit.UIKeyboardFrameEndUserInfoKey())).CGRectValue().size().height();
+        setAdditionalSafeAreaInsets(new UIEdgeInsets(0, 0, keyboardHeight, 0));
+    }
+
     @Override
     public long preferredStatusBarStyle() {
         return UIStatusBarStyle.BlackOpaque;

Modified: iOSME/src/net/yura/ios/NativeTextEntry.java
===================================================================
--- iOSME/src/net/yura/ios/NativeTextEntry.java	2021-11-01 15:46:24 UTC (rev 2565)
+++ iOSME/src/net/yura/ios/NativeTextEntry.java	2021-11-01 17:20:01 UTC (rev 2566)
@@ -5,7 +5,6 @@
 import net.yura.mobile.gui.components.TextComponent;
 import javax.microedition.lcdui.TextBox;
 import javax.microedition.lcdui.TextField;
-
 import apple.uikit.enums.UIKeyboardType;
 import apple.uikit.enums.UITextAutocapitalizationType;
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2565] iOSME/src/javax/microedition/lcdui/Canvas.java

[<yu...@us...>]

Revision: 2565
          http://sourceforge.net/p/swingme/code/2565
Author:   yuranet
Date:     2021-11-01 15:46:24 +0000 (Mon, 01 Nov 2021)
Log Message:
-----------
enter is fire action

Modified Paths:
--------------
    iOSME/src/javax/microedition/lcdui/Canvas.java

Modified: iOSME/src/javax/microedition/lcdui/Canvas.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Canvas.java	2021-11-01 15:06:55 UTC (rev 2564)
+++ iOSME/src/javax/microedition/lcdui/Canvas.java	2021-11-01 15:46:24 UTC (rev 2565)
@@ -52,6 +52,7 @@
         switch (keyCode) {
             case -5:
             case -10:
+            case '\n':
                 res = Canvas.FIRE;
                 break;
             case -1:

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2564] iOSME/src/net/yura/ios

[<yu...@us...>]

Revision: 2564
          http://sourceforge.net/p/swingme/code/2564
Author:   yuranet
Date:     2021-11-01 15:06:55 +0000 (Mon, 01 Nov 2021)
Log Message:
-----------
open correct keyboard

Modified Paths:
--------------
    iOSME/src/net/yura/ios/CanvasView.java

Added Paths:
-----------
    iOSME/src/net/yura/ios/NativeTextEntry.java

Modified: iOSME/src/net/yura/ios/CanvasView.java
===================================================================
--- iOSME/src/net/yura/ios/CanvasView.java	2021-11-01 13:15:11 UTC (rev 2563)
+++ iOSME/src/net/yura/ios/CanvasView.java	2021-11-01 15:06:55 UTC (rev 2564)
@@ -186,4 +186,14 @@
             canvas.fireKeyPressedReleased(text.charAt(c));
         }
     }
+
+    @Override
+    public long keyboardType() {
+        return NativeTextEntry.keyboardTypeFor(textField.getConstraints());
+    }
+
+    @Override
+    public long autocapitalizationType() {
+        return NativeTextEntry.autocapitalizationTypeFor(textField.getConstraints());
+    }
 }
\ No newline at end of file

Added: iOSME/src/net/yura/ios/NativeTextEntry.java
===================================================================
--- iOSME/src/net/yura/ios/NativeTextEntry.java	                        (rev 0)
+++ iOSME/src/net/yura/ios/NativeTextEntry.java	2021-11-01 15:06:55 UTC (rev 2564)
@@ -0,0 +1,56 @@
+package net.yura.ios;
+
+import net.yura.mobile.gui.ChangeListener;
+import net.yura.mobile.gui.components.Component;
+import net.yura.mobile.gui.components.TextComponent;
+import javax.microedition.lcdui.TextBox;
+import javax.microedition.lcdui.TextField;
+
+import apple.uikit.enums.UIKeyboardType;
+import apple.uikit.enums.UITextAutocapitalizationType;
+
+public class NativeTextEntry {
+
+    public static void init() {
+        TextComponent.STAR = '\u2022'; // Bullet
+
+        TextComponent.staticFocusListener = new ChangeListener() {
+            @Override
+            public void changeEvent(Component source, int num) {
+                if (num == Component.FOCUS_GAINED) {
+                    ((TextComponent)source).openNativeEditor();
+                }
+                else if (num == Component.FOCUS_LOST) {
+                    TextComponent.closeNativeEditor();
+                }
+            }
+        };
+    }
+
+    public static long keyboardTypeFor(int constraints) {
+        switch (constraints & TextField.CONSTRAINT_MASK) {
+            case TextField.NUMERIC:
+                return UIKeyboardType.NumberPad;
+            case TextField.DECIMAL:
+                return UIKeyboardType.DecimalPad;
+            case TextField.PHONENUMBER:
+                return UIKeyboardType.PhonePad;
+            case TextField.EMAILADDR:
+                return UIKeyboardType.EmailAddress;
+            case TextField.URL:
+                return UIKeyboardType.URL;
+            default: // TextField.ANY:
+                return UIKeyboardType.Default;
+        }
+    }
+
+    public static long autocapitalizationTypeFor(int constraints) {
+        if ((constraints & TextField.INITIAL_CAPS_WORD) > 0) {
+            return UITextAutocapitalizationType.Words;
+        }
+        if ((constraints & TextField.INITIAL_CAPS_SENTENCE) > 0) {
+            return UITextAutocapitalizationType.Sentences;
+        }
+        return UITextAutocapitalizationType.None;
+    }
+}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2563] iOSME/src

[<yu...@us...>]

Revision: 2563
          http://sourceforge.net/p/swingme/code/2563
Author:   yuranet
Date:     2021-11-01 13:15:11 +0000 (Mon, 01 Nov 2021)
Log Message:
-----------
can get key events

Modified Paths:
--------------
    iOSME/src/javax/microedition/lcdui/Canvas.java
    iOSME/src/javax/microedition/lcdui/Display.java
    iOSME/src/javax/microedition/lcdui/TextBox.java
    iOSME/src/javax/microedition/midlet/MIDlet.java
    iOSME/src/net/yura/ios/CanvasView.java
    iOSME/src/net/yura/ios/SwingMEiOSApplication.java

Modified: iOSME/src/javax/microedition/lcdui/Canvas.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Canvas.java	2021-11-01 11:23:59 UTC (rev 2562)
+++ iOSME/src/javax/microedition/lcdui/Canvas.java	2021-11-01 13:15:11 UTC (rev 2563)
@@ -197,6 +197,11 @@
         }
     }
 
+    public void fireKeyPressedReleased(int code) {
+        keyPressed(code);
+        keyReleased(code);
+    }
+
     protected void keyPressed(int keyCode) {
     }
 

Modified: iOSME/src/javax/microedition/lcdui/Display.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Display.java	2021-11-01 11:23:59 UTC (rev 2562)
+++ iOSME/src/javax/microedition/lcdui/Display.java	2021-11-01 13:15:11 UTC (rev 2563)
@@ -109,7 +109,7 @@
 
         // Hide Keyboard, any time a new Displayable is set
         if (!(newCurrent instanceof TextBox) && current instanceof Canvas) {
-            ((Canvas) current).canvasView.resignFirstResponder();
+            ((Canvas) current).canvasView.closeTextEntry();
         }
 
         if (newCurrent != current) {

Modified: iOSME/src/javax/microedition/lcdui/TextBox.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/TextBox.java	2021-11-01 11:23:59 UTC (rev 2562)
+++ iOSME/src/javax/microedition/lcdui/TextBox.java	2021-11-01 13:15:11 UTC (rev 2563)
@@ -1,6 +1,8 @@
 package javax.microedition.lcdui;
 
 import net.yura.ios.AppController;
+import net.yura.ios.CanvasView;
+import javax.microedition.midlet.MIDlet;
 import apple.uikit.UIView;
 
 public class TextBox extends Screen {
@@ -33,13 +35,16 @@
     }
 
     /**
-     * this is called so start the text entry by AndroidME
+     * this is called so start the text entry by
+     * @see net.yura.ios.NativeTextEntry
      */
     @Override
     public void initDisplayable(AppController midlet) {
 
-        throw new UnsupportedOperationException();
+        Display display = Display.getDisplay(MIDlet.DEFAULT_MIDLET);
+        CanvasView canvas = ((Canvas) display.getCurrent()).canvasView;
 
+        canvas.openTextEntry();
     }
 
     public int getMaxSize() {

Modified: iOSME/src/javax/microedition/midlet/MIDlet.java
===================================================================
--- iOSME/src/javax/microedition/midlet/MIDlet.java	2021-11-01 11:23:59 UTC (rev 2562)
+++ iOSME/src/javax/microedition/midlet/MIDlet.java	2021-11-01 13:15:11 UTC (rev 2563)
@@ -11,6 +11,7 @@
 import apple.foundation.NSURLComponents;
 import apple.uikit.UIApplication;
 import apple.uikit.UINavigationController;
+import apple.uikit.UIPasteboard;
 
 public abstract class MIDlet {
 
@@ -103,25 +104,23 @@
                 throw new UnsupportedOperationException();
             }
             else if (url.equals("clipboard://get")) {
-/*
-            	Object obj = clipboardManager.getText();
-            	if (obj==null) {
+                UIPasteboard clipboard = UIPasteboard.generalPasteboard();
+                String text = clipboard.string();
+
+            	if (text == null) {
             		System.clearProperty("clipboard.text");
             	}
             	else {
-            		System.setProperty("clipboard.text", obj.toString()); // so far we only support Strings
+            		System.setProperty("clipboard.text", text); // so far we only support Strings
             	}
-*/
-                throw new UnsupportedOperationException();
             }
             else if (url.startsWith("clipboard://put/")) {
-/*
-            	String text = url.substring( "clipboard://put/".length() );
+                UIPasteboard clipboard = UIPasteboard.generalPasteboard();
+            	String text = url.substring("clipboard://put/".length());
+
             	if (!"".equals(text)) {
-            		clipboardManager.setText( text );
+                    clipboard.setString(text);
             	}
-*/
-                throw new UnsupportedOperationException();
             }
             else if (url.equals("wakelock://true")) {
                 callOnMainThread(new Runnable() {

Modified: iOSME/src/net/yura/ios/CanvasView.java
===================================================================
--- iOSME/src/net/yura/ios/CanvasView.java	2021-11-01 11:23:59 UTC (rev 2562)
+++ iOSME/src/net/yura/ios/CanvasView.java	2021-11-01 13:15:11 UTC (rev 2563)
@@ -1,5 +1,9 @@
 package net.yura.ios;
 
+import net.yura.mobile.gui.DesktopPane;
+import net.yura.mobile.gui.KeyEvent;
+import net.yura.mobile.gui.components.TextComponent;
+import net.yura.mobile.gui.components.Window;
 import org.moe.natj.general.Pointer;
 import javax.microedition.lcdui.Canvas;
 import javax.microedition.lcdui.Graphics;
@@ -15,8 +19,9 @@
 import apple.uikit.UIView;
 import apple.uikit.c.UIKit;
 import apple.uikit.enums.UIViewContentMode;
+import apple.uikit.protocol.UIKeyInput;
 
-public class CanvasView extends UIView {
+public class CanvasView extends UIView implements UIKeyInput {
 
     public static native CanvasView alloc();
 
@@ -147,83 +152,38 @@
         canvas.firePointerReleased((int) point.x(), (int) point.y());
     }
 
-/*
-        @Override
-        public boolean onKeyDown(int keyCode, KeyEvent event) {
+    private TextComponent textField;
 
-            int keyCount = event.getRepeatCount();
+    public void openTextEntry() {
+        Window window = DesktopPane.getDesktopPane().getSelectedFrame();
+        textField = (TextComponent)window.getFocusOwner();
+        becomeFirstResponder();
+    }
 
-            if ( isKeyHandled(keyCode) ) {
-                this.restartKeyboardInput = true;
+    public void closeTextEntry() {
+        textField = null;
+        resignFirstResponder();
+    }
 
-                if (keyCode == KeyEvent.KEYCODE_MENU) {
-                    keyMenuCount = keyCount;
-                    if (keyMenuCount == 1) {
-                        toggleNativeTextInput();
-                    }
-                }
-                else if (keyCode == KeyEvent.KEYCODE_BACK) {
-                    keyBackCount = keyCount;
-                    if (keyCount == 1) {
-                        // kill the application on a "long back key" press
-                        // TODO: Should show some native Android UI for confirmation
-                        AndroidMeApp.getMIDlet().notifyDestroyed();
-                    }
-                }
-                else {
-                    int meKeyCode = getKeyCode(event);
-                    if (keyCount == 0) {
-                        keyPressed(meKeyCode);
-                    } else {
-                        keyRepeated(meKeyCode);
-                    }
-                }
-                return true;
-            }
-            else if (keyCode == KeyEvent.KEYCODE_MENU && keyCount == 0) {
-                // HACK: Work around for issue:
-                // http://code.google.com/p/android/issues/detail?id=11833
-                //#debug debug
-                Log.d("YURA", "[AndroidMeActivity] onMenuKeyDown");
-                if (menu!=null) {
-                    menu.close();
-                }
-            }
+    @Override
+    public boolean canBecomeFirstResponder() {
+        return textField != null;
+    }
 
-            return super.onKeyDown(keyCode, event);
-        }
+    @Override
+    public boolean hasText() {
+        return !"".equals(textField.getText());
+    }
 
-        @Override
-        public boolean onKeyUp(int keyCode, KeyEvent event) {
+    @Override
+    public void deleteBackward() {
+        canvas.fireKeyPressedReleased(KeyEvent.KEY_CLEAR);
+    }
 
-            if ( isKeyHandled(keyCode) ) {
-                this.restartKeyboardInput = true;
-
-                int meKeyCode = getKeyCode(event);
-                if (keyCode == KeyEvent.KEYCODE_MENU) {
-                    if (keyMenuCount == 0) {
-                        // Simulate a press on menu
-                        keyPressed(meKeyCode);
-                        keyReleased(meKeyCode);
-                    }
-                    keyMenuCount = -1;
-                }
-                else if (keyCode == KeyEvent.KEYCODE_BACK) {
-                    if (keyBackCount == 0) {
-                        // Simulate a press on menu
-                        keyPressed(meKeyCode);
-                        keyReleased(meKeyCode);
-                    }
-                    keyBackCount = -1;
-                }
-                else {
-                    keyReleased(meKeyCode);
-                }
-
-                return true;
-            }
-
-            return super.onKeyUp(keyCode, event);
+    @Override
+    public void insertText(String text) {
+        for (int c = 0; c < text.length(); c++) {
+            canvas.fireKeyPressedReleased(text.charAt(c));
         }
-*/
+    }
 }
\ No newline at end of file

Modified: iOSME/src/net/yura/ios/SwingMEiOSApplication.java
===================================================================
--- iOSME/src/net/yura/ios/SwingMEiOSApplication.java	2021-11-01 11:23:59 UTC (rev 2562)
+++ iOSME/src/net/yura/ios/SwingMEiOSApplication.java	2021-11-01 13:15:11 UTC (rev 2563)
@@ -82,6 +82,9 @@
 
         // setup and launch swingme app
         setupSystemProperties();
+
+        NativeTextEntry.init();
+
         NSBundle mainBundle = NSBundle.mainBundle();
         String mainClass = (String)mainBundle.objectForInfoDictionaryKey("SwingME.Main.Class");
         if (mainClass == null) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2562] iOSME/src

[<yu...@us...>]

Revision: 2562
          http://sourceforge.net/p/swingme/code/2562
Author:   yuranet
Date:     2021-11-01 11:23:59 +0000 (Mon, 01 Nov 2021)
Log Message:
-----------
removed unused code

Modified Paths:
--------------
    iOSME/src/javax/microedition/lcdui/Display.java
    iOSME/src/javax/microedition/lcdui/Displayable.java
    iOSME/src/net/yura/ios/AppController.java

Modified: iOSME/src/javax/microedition/lcdui/Display.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Display.java	2021-11-01 10:16:28 UTC (rev 2561)
+++ iOSME/src/javax/microedition/lcdui/Display.java	2021-11-01 11:23:59 UTC (rev 2562)
@@ -4,6 +4,8 @@
 import org.moe.natj.objc.SEL;
 import java.util.Hashtable;
 import javax.microedition.midlet.MIDlet;
+import apple.audiotoolbox.c.AudioToolbox;
+import apple.audiotoolbox.enums.Enums;
 import apple.foundation.NSOperationQueue;
 import apple.uikit.UIApplication;
 
@@ -36,8 +38,7 @@
     private AppController appController;
 
     private Displayable current;
-    //TODO: Create accessor
-    public Displayable hiddenDisplay;
+
     private MIDlet midlet;
 
     private Display(MIDlet midlet) {
@@ -108,80 +109,25 @@
 
         // Hide Keyboard, any time a new Displayable is set
         if (!(newCurrent instanceof TextBox) && current instanceof Canvas) {
-            //((Canvas) current).hideSoftKeyboard();
+            ((Canvas) current).canvasView.resignFirstResponder();
         }
 
-        //if (activity == null) {
-        //    hiddenDisplay = newCurrent;
-        //    return;
-        //}
-        hiddenDisplay = null;
-
         if (newCurrent != current) {
 
-            newCurrent.setCurrentDisplay(Display.this);
-
             if (appController != null) {
                 newCurrent.initDisplayable(appController);
             }
 
+            // TextBox is special... we don't really have any UI
+            if (newCurrent instanceof TextBox) {
+                return;
+            }
+
             current = newCurrent;
-            /*
-            AndroidMeApp.getIntance().invokeAndWait(new Runnable() {
-                public void run() {
-
-                    // TextBox is special... we don't really have any UI
-                    if (newCurrent instanceof TextBox) {
-                        newCurrent.initDisplayable(null);
-                        return;
-                    }
-
-                    Displayable old = current;
-                    current = newCurrent;
-
-                    if (old != null) {
-                        old.setCurrentDisplay(null);
-                    }
-
-                    newCurrent.setCurrentDisplay(Display.this);
-                    newCurrent.initDisplayable(Display.this.midlet);
-
-                    View view = newCurrent.getView();
-                    if (view != null) {
-                        activity.setContentView(view);
-                        view.requestFocus();
-
-                        // YURA tiny optimization, so we do not need to draw any background bitmaps!
-                        view.getRootView().setBackgroundDrawable(null);
-                    }
-                    else {
-                        throw new RuntimeException("view is null");
-                    }
-                }
-            });
-
-            // Wait for the view to be set...
-            //YURA: remove this AndroidMeApp.getIntance().invokeAndWait(new Thread());
-            */
         }
     }
 
     /**
-     * clean up if Activity is destroyed
-     */
-    public void killUI() {
-        if (current!=null) {
-            //View view = current.getView();
-            //Object parent = view.getParent();
-            //if (parent instanceof ViewGroup) {
-            //    ((ViewGroup)parent).removeView(view);
-            //}
-            hiddenDisplay = current;
-            current=null;
-        }
-    }
-
-    /**
      * @see apple.c.Globals#dispatch_main()
      */
     public void callSerially(Runnable runner) {
@@ -207,21 +153,20 @@
      * @return true if the vibrator can be controlled by the application and this display is in the foreground, false otherwise
      */
     public boolean vibrate(int duration) {
-        // TODO vibrate
+        // TODO take duration into account
+        AudioToolbox.AudioServicesPlaySystemSound(Enums.kSystemSoundID_Vibrate);
         return true;
     }
 
     public void flashBacklight(int duration) {
-        // TODO Auto-generated method stub
+        // TODO make this do something
     }
 
     public int numAlphaLevels() {
-        // TODO Auto-generated method stub
-        return 255;
+        return 256;
     }
 
     public int numColors() {
-        // TODO Auto-generated method stub
-        return 0x00FFFFFF;
+        return 16_777_216;
     }
 }

Modified: iOSME/src/javax/microedition/lcdui/Displayable.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Displayable.java	2021-11-01 10:16:28 UTC (rev 2561)
+++ iOSME/src/javax/microedition/lcdui/Displayable.java	2021-11-01 11:23:59 UTC (rev 2562)
@@ -7,12 +7,32 @@
 import apple.uikit.UIView;
 
 public abstract class Displayable {
+
 	protected CommandListener commandListener;
 	private Vector<Command> commands = new Vector<Command>();
-	private Display currentDisplay;
 
 	private double width, height;
+	private String title;
 
+	public abstract void initDisplayable(AppController controller);
+
+	public abstract UIView getView();
+
+	public boolean isShown() {
+		return Display.getDisplay(MIDlet.DEFAULT_MIDLET).getCurrent() == this;
+	}
+
+	public void setTitle(String object) {
+		title = object;
+
+		// TODO set app title
+		throw new UnsupportedOperationException();
+	}
+
+	public String getTitle() {
+		return title;
+	}
+
 	public void addCommand(Command command) {
 		boolean added = false;
 		for (int i = 0; i < this.commands.size(); i++) {
@@ -70,51 +90,4 @@
 	public int getHeight() {
 		return (int) height;
 	}
-
-	public Display getCurrentDisplay() {
-		return currentDisplay;
-	}
-
-	public void setCurrentDisplay(Display currentDisplay) {
-		this.currentDisplay = currentDisplay;
-	}
-
-	public abstract void initDisplayable(AppController controller);
-
-	public abstract UIView getView();
-
-
-	public boolean isShown() {
-		throw new UnsupportedOperationException();
-	    //return AndroidMeActivity.DEFAULT_ACTIVITY != null && Display.getDisplay(AndroidMeApp.getMIDlet()).getCurrent() == this;
-	}
-        private String title;
-	public void setTitle(String object) {
-	    title = object;
-
-		throw new UnsupportedOperationException();
-		/*
-	    if (isShown()) {
-	        AndroidMeApp.getIntance().invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        try {
-                            AndroidMeActivity.DEFAULT_ACTIVITY.setTitle(title);
-
-                            if (invalidateOptionsMenu!=null) {
-                                invalidateOptionsMenu.invoke( AndroidMeActivity.DEFAULT_ACTIVITY, (Object[])null);
-                            }
-                        }
-                        catch (Throwable ex) {
-                            //#debug debug
-                            ex.printStackTrace();
-                        }
-                    }
-                });
-	    }
-	    */
-	}
-	public String getTitle() {
-	    return title;
-	}
 }

Modified: iOSME/src/net/yura/ios/AppController.java
===================================================================
--- iOSME/src/net/yura/ios/AppController.java	2021-11-01 10:16:28 UTC (rev 2561)
+++ iOSME/src/net/yura/ios/AppController.java	2021-11-01 11:23:59 UTC (rev 2562)
@@ -39,6 +39,9 @@
         return UIStatusBarStyle.BlackOpaque;
     }
 
+    /**
+     * @see CanvasView
+     */
     public void setRendererView(UIView renderer) {
         this.renderer = renderer;
         view().addSubview(renderer);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2561] iOSME/src/javax/microedition/lcdui/Display.java

[<yu...@us...>]

Revision: 2561
          http://sourceforge.net/p/swingme/code/2561
Author:   yuranet
Date:     2021-11-01 10:16:28 +0000 (Mon, 01 Nov 2021)
Log Message:
-----------
can send app to background

Modified Paths:
--------------
    iOSME/src/javax/microedition/lcdui/Display.java

Modified: iOSME/src/javax/microedition/lcdui/Display.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Display.java	2021-10-22 16:11:02 UTC (rev 2560)
+++ iOSME/src/javax/microedition/lcdui/Display.java	2021-11-01 10:16:28 UTC (rev 2561)
@@ -1,9 +1,11 @@
 package javax.microedition.lcdui;
 
 import net.yura.ios.AppController;
+import org.moe.natj.objc.SEL;
 import java.util.Hashtable;
 import javax.microedition.midlet.MIDlet;
 import apple.foundation.NSOperationQueue;
+import apple.uikit.UIApplication;
 
 public class Display {
 
@@ -99,8 +101,9 @@
     public void setCurrent(final Displayable newCurrent) {
 
         if (newCurrent == null) {
-            // TODO hide app, then return
-            throw new UnsupportedOperationException();
+            // https://stackoverflow.com/questions/5360846/suspend-the-application
+            UIApplication.sharedApplication().performSelector(new SEL("suspend"));
+            return;
         }
 
         // Hide Keyboard, any time a new Displayable is set

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.