You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(54) |
Aug
(33) |
Sep
(27) |
Oct
(10) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(7) |
Feb
(5) |
Mar
(7) |
Apr
(1) |
May
(1) |
Jun
(1) |
Jul
(25) |
Aug
(41) |
Sep
(89) |
Oct
(99) |
Nov
(161) |
Dec
(85) |
| 2010 |
Jan
(10) |
Feb
(35) |
Mar
(44) |
Apr
(115) |
May
(98) |
Jun
(87) |
Jul
(23) |
Aug
(27) |
Sep
(63) |
Oct
(57) |
Nov
(97) |
Dec
(62) |
| 2011 |
Jan
(67) |
Feb
(83) |
Mar
(43) |
Apr
(14) |
May
(43) |
Jun
(52) |
Jul
(55) |
Aug
(97) |
Sep
(65) |
Oct
(36) |
Nov
(67) |
Dec
(46) |
| 2012 |
Jan
(29) |
Feb
(24) |
Mar
(10) |
Apr
(2) |
May
(10) |
Jun
(34) |
Jul
(31) |
Aug
(9) |
Sep
(10) |
Oct
(10) |
Nov
(6) |
Dec
(7) |
| 2013 |
Jan
(1) |
Feb
(1) |
Mar
(5) |
Apr
(2) |
May
(17) |
Jun
(10) |
Jul
(8) |
Aug
(17) |
Sep
|
Oct
(3) |
Nov
(4) |
Dec
(1) |
| 2014 |
Jan
(2) |
Feb
(8) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
(5) |
Aug
(2) |
Sep
(1) |
Oct
(1) |
Nov
(5) |
Dec
(8) |
| 2015 |
Jan
(1) |
Feb
|
Mar
(4) |
Apr
|
May
(2) |
Jun
(1) |
Jul
(1) |
Aug
|
Sep
(1) |
Oct
|
Nov
(1) |
Dec
|
| 2016 |
Jan
|
Feb
(1) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(2) |
| 2018 |
Jan
|
Feb
(2) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
(4) |
| 2019 |
Jan
(2) |
Feb
|
Mar
(4) |
Apr
(4) |
May
(2) |
Jun
(1) |
Jul
|
Aug
|
Sep
(3) |
Oct
|
Nov
|
Dec
(4) |
| 2020 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
(1) |
Jun
(6) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2021 |
Jan
|
Feb
(7) |
Mar
(29) |
Apr
(8) |
May
(7) |
Jun
(45) |
Jul
(66) |
Aug
|
Sep
|
Oct
(2) |
Nov
(37) |
Dec
(34) |
| 2022 |
Jan
(15) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
(10) |
Jul
|
Aug
|
Sep
|
Oct
(5) |
Nov
(1) |
Dec
(7) |
| 2023 |
Jan
(23) |
Feb
(18) |
Mar
(18) |
Apr
(6) |
May
(10) |
Jun
(7) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2024 |
Jan
(11) |
Feb
(3) |
Mar
|
Apr
(6) |
May
(3) |
Jun
|
Jul
|
Aug
(2) |
Sep
(16) |
Oct
(6) |
Nov
(7) |
Dec
(6) |
| 2025 |
Jan
(8) |
Feb
(3) |
Mar
(7) |
Apr
(5) |
May
(21) |
Jun
(10) |
Jul
(16) |
Aug
(5) |
Sep
(19) |
Oct
(2) |
Nov
|
Dec
|
|
From: <yu...@us...> - 2023-04-26 16:49:44
|
Revision: 2735
http://sourceforge.net/p/swingme/code/2735
Author: yuranet
Date: 2023-04-26 16:49:42 +0000 (Wed, 26 Apr 2023)
Log Message:
-----------
theme fix for file chooser
Modified Paths:
--------------
AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java
SwingME/src/net/yura/mobile/gui/components/FileChooser.java
Modified: AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java
===================================================================
--- AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java 2023-04-26 12:52:11 UTC (rev 2734)
+++ AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java 2023-04-26 16:49:42 UTC (rev 2735)
@@ -210,7 +210,8 @@
Style listCellRenderer = new Style(defaultStyle);
Border mainBorder = getBorder(ctx, android.R.style.Widget_ListView, android.R.attr.listSelector , listExtraPadding);
listCellRenderer.addBorder(new BorderWithDivider(mainBorder, divider2,false ),Style.ALL);
- setStyleFor("ListRenderer",listCellRenderer);
+ setStyleFor("ListRenderer", listCellRenderer);
+ setStyleFor("CheckBoxRenderer", listCellRenderer);
// --- List (No padding) ---
Style listCellRendererCollapsed = new Style(defaultStyle);
Modified: SwingME/src/net/yura/mobile/gui/components/FileChooser.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/FileChooser.java 2023-04-26 12:52:11 UTC (rev 2734)
+++ SwingME/src/net/yura/mobile/gui/components/FileChooser.java 2023-04-26 16:49:42 UTC (rev 2735)
@@ -386,13 +386,17 @@
if (gridView.isSelected()) {
fileTable.setSelectedIndex(-1);
setFileList(files);
- fileTable.setSelectedIndex(0);
+ if (!getDesktopPane().DEFAULT_NO_FOCUS) {
+ fileTable.setSelectedIndex(0);
+ }
fileTable.setLocation(scroll.getViewPortX(), scroll.getViewPortY());
}
else {
fileList.setSelectedIndex(-1);
setFileList(files);
- fileList.setSelectedIndex(0);
+ if (!getDesktopPane().DEFAULT_NO_FOCUS) {
+ fileList.setSelectedIndex(0);
+ }
fileList.setLocation(scroll.getViewPortX(), scroll.getViewPortY());
}
@@ -1037,8 +1041,10 @@
setupState(list, isSelected, cellHasFocus);
- if (getForeground()==Style.NO_COLOR && list!=null) {// if our theme does not give us a foreground, then fall back to parent
- setForeground( list.getForeground() );
+ if (list != null) {
+ list.setState(getCurrentState());
+ setForeground(list.getForeground());
+ list.setState(-1);
}
return this;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2023-04-26 12:52:15
|
Revision: 2734
http://sourceforge.net/p/swingme/code/2734
Author: yuranet
Date: 2023-04-26 12:52:11 +0000 (Wed, 26 Apr 2023)
Log Message:
-----------
javadoc update
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/DesktopPane.java
SwingME/src/net/yura/mobile/gui/KeyEvent.java
SwingME/src/net/yura/mobile/gui/components/Component.java
SwingME/src/net/yura/mobile/gui/components/List.java
SwingME/src/net/yura/mobile/gui/components/TextArea.java
SwingME/src/net/yura/mobile/gui/components/ToolTip.java
Modified: SwingME/src/net/yura/mobile/gui/DesktopPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/DesktopPane.java 2023-04-26 12:14:15 UTC (rev 2733)
+++ SwingME/src/net/yura/mobile/gui/DesktopPane.java 2023-04-26 12:52:11 UTC (rev 2734)
@@ -1416,7 +1416,6 @@
* @see javax.microedition.lcdui.ScmCanvas#mouseReleased(int, int, int, int)
*/
private void pointerEvent(int type, int x, int y) {
-
//System.out.println("SM pointerEvent "+pointerComponent+" point="+type+" "+x+" "+y);
try {
@@ -1453,6 +1452,8 @@
}
// check its dragged more then 5px
else if (!(isAccurate(pointerFirstX, x, inaccuracy) && isAccurate(pointerFirstY, y, inaccuracy))) {
+ // we do NOT yet have the x and y for this event inside the component (calculated further down)
+ // we send 0,0 as there is nothing the component should be doing with the location anyway
pointerComponent.processMouseEvent(CANCEL, 0, 0, keypad);
pointerComponent = null;
@@ -1539,7 +1540,7 @@
toast.repaint();
animateComponent(toast);
}
-
+
private void showHideToolTip(boolean show, Component comp) {
// if a tooltip should be setup
Modified: SwingME/src/net/yura/mobile/gui/KeyEvent.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/KeyEvent.java 2023-04-26 12:14:15 UTC (rev 2733)
+++ SwingME/src/net/yura/mobile/gui/KeyEvent.java 2023-04-26 12:52:11 UTC (rev 2734)
@@ -92,7 +92,7 @@
/**
* MS4SE Right Click Key
- * @see java.awt.event.MouseEvent#isPopupTrigger()
+ * also used on mobile when there is a long press event
*/
public static final int KEY_RIGHT_CLICK = -51;
Modified: SwingME/src/net/yura/mobile/gui/components/Component.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Component.java 2023-04-26 12:14:15 UTC (rev 2733)
+++ SwingME/src/net/yura/mobile/gui/components/Component.java 2023-04-26 12:52:11 UTC (rev 2734)
@@ -18,7 +18,6 @@
package net.yura.mobile.gui.components;
import javax.microedition.lcdui.Canvas;
-
import net.yura.mobile.gui.ChangeListener;
import net.yura.mobile.gui.DesktopPane;
import net.yura.mobile.gui.Graphics2D;
@@ -484,7 +483,9 @@
public abstract void paintComponent(Graphics2D g);
/**
+ * @return true if the event has been consumed
* @see javax.swing.JComponent#processKeyEvent(java.awt.event.KeyEvent) JComponent.processKeyEvent
+ * @see awt.event.InputEvent#consume()
*/
public boolean processKeyEvent(KeyEvent keypad) {
return false;
@@ -491,9 +492,7 @@
}
/**
- * @return true if the event has been consumed and should not trigger any more actions, usually when popupmenu is triggered.
* @see java.awt.Component#processMouseEvent(java.awt.event.MouseEvent) Component.processMouseEvent
- * @see awt.event.InputEvent#consume()
*/
public void processMouseEvent(int type, int x, int y, KeyEvent buttons) {
Modified: SwingME/src/net/yura/mobile/gui/components/List.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/List.java 2023-04-26 12:14:15 UTC (rev 2733)
+++ SwingME/src/net/yura/mobile/gui/components/List.java 2023-04-26 12:52:11 UTC (rev 2734)
@@ -204,7 +204,6 @@
totalWidth=w;
}
}
-
}
width = totalWidth;
@@ -228,7 +227,6 @@
ensureIndexIsVisible(ensureIndexIsVisible);
}
}
-
}
/**
@@ -385,7 +383,6 @@
offset = offset + ((layoutOrientation==HORIZONTAL)?cw:ch);
}
-
}
return new int[] {ri,roffset} ;
@@ -446,10 +443,7 @@
}
offset = offset + ((layoutOrientation==HORIZONTAL)?c.getWidthWithBorder():c.getHeightWithBorder());
-
}
-
-
}
/**
@@ -492,7 +486,6 @@
// this is used by android menus and all other wrapping lists
// if we are not HORIZONTAL or VERTICAL
return getComponentFor(a,offset); // offset is ZERO
-
}
protected Component getComponentFor(int i,int offset) {
@@ -688,12 +681,10 @@
selectNewKey(i,keypad);
return true;
-
}
}
return false;
-
}
else if (keypad.isDownAction(Canvas.DOWN)) {
@@ -713,7 +704,6 @@
return false;
//}
-
}
else if (keypad.isDownAction(Canvas.UP)) {
@@ -732,7 +722,6 @@
}
return false;
//}
-
}
else if (keypad.isDownAction(Canvas.RIGHT)) {
@@ -754,7 +743,6 @@
return false;
//}
-
}
else if (keypad.isDownAction(Canvas.LEFT)) {
@@ -774,7 +762,6 @@
return false;
//}
-
}
else if (keypad.justPressedAction(Canvas.FIRE) || keypad.justPressedKey('\n')) {
if (isCtrlKeyDown(keypad)) {
@@ -799,7 +786,6 @@
return true;
}
return false;
-
}
/**
@@ -820,8 +806,6 @@
return current;
}
-
-
/**
* @param a the index of the one cell to select
* @see javax.swing.JList#setSelectedIndex(int) JList.setSelectedIndex
@@ -925,7 +909,6 @@
Logger.warn("unknown command in List actionPerformed: " + actionCommand);
}
//#enddebug
-
}
public boolean isUseSelectButton() {
Modified: SwingME/src/net/yura/mobile/gui/components/TextArea.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/TextArea.java 2023-04-26 12:14:15 UTC (rev 2733)
+++ SwingME/src/net/yura/mobile/gui/components/TextArea.java 2023-04-26 12:52:11 UTC (rev 2734)
@@ -198,7 +198,6 @@
this.lineSpacing = lineSpacing;
}
-
/**
* Get the line spacing
* @see javax.swing.text.StyleConstants#getLineSpacing() StyleConstants.getLineSpacing
@@ -272,11 +271,8 @@
setCaretPosition(text.length()); // not sure if this should be always done
}
}
-
-
}
-
protected void changedUpdate(int offset,int length) {
if (lines==null) return;
@@ -329,7 +325,6 @@
gotoLine(line-1,caretPixelOffset);
return true;
}
-
}
else if (keyEvent.isDownAction(Canvas.DOWN)) {
@@ -340,7 +335,6 @@
gotoLine(line+1,caretPixelOffset);
return true;
}
-
}
}
@@ -358,10 +352,8 @@
int mid = searchStringCharOffset(text,font,xPixelOffset);
setCaretPosition(startOfLineOffset+mid);
-
}
-
public void processMouseEvent(int type, int x, int y, KeyEvent keys) {
super.processMouseEvent(type, x, y, keys);
if (focusable) {
Modified: SwingME/src/net/yura/mobile/gui/components/ToolTip.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/ToolTip.java 2023-04-26 12:14:15 UTC (rev 2733)
+++ SwingME/src/net/yura/mobile/gui/components/ToolTip.java 2023-04-26 12:52:11 UTC (rev 2734)
@@ -57,5 +57,4 @@
public void setShowing(boolean b) {
showing = b;
}
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2023-04-26 12:14:27
|
Revision: 2733
http://sourceforge.net/p/swingme/code/2733
Author: yuranet
Date: 2023-04-26 12:14:15 +0000 (Wed, 26 Apr 2023)
Log Message:
-----------
any component can easily detect right click/long press
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/DesktopPane.java
SwingME/src/net/yura/mobile/gui/KeyEvent.java
SwingME/src/net/yura/mobile/gui/components/Button.java
SwingME/src/net/yura/mobile/gui/components/Component.java
SwingME/src/net/yura/mobile/gui/components/FrameTitlePane.java
SwingME/src/net/yura/mobile/gui/components/ImageView.java
SwingME/src/net/yura/mobile/gui/components/List.java
SwingME/src/net/yura/mobile/gui/components/Menu.java
SwingME/src/net/yura/mobile/gui/components/Slider.java
SwingME/src/net/yura/mobile/gui/components/Spinner.java
SwingME/src/net/yura/mobile/gui/components/TextComponent.java
SwingME/src/net/yura/mobile/gui/components/Window.java
Modified: SwingME/src/net/yura/mobile/gui/DesktopPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/DesktopPane.java 2023-04-15 14:03:34 UTC (rev 2732)
+++ SwingME/src/net/yura/mobile/gui/DesktopPane.java 2023-04-26 12:14:15 UTC (rev 2733)
@@ -1350,9 +1350,23 @@
//==== pointer commands ====================================================
//\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0
- public static final int DRAGGED = 0;
+ /**
+ * @see java.awt.event.MouseEvent#MOUSE_PRESSED
+ */
public static final int PRESSED = 1;
+ /**
+ * @see java.awt.event.MouseEvent#MOUSE_DRAGGED
+ */
+ public static final int DRAGGED = 6;
+ /**
+ * @see java.awt.event.MouseEvent#MOUSE_RELEASED
+ */
public static final int RELEASED = 2;
+ /**
+ * This is used the same way as android, when scrolling has taken over and
+ * we want to tell the component to cancel whatever it was going to do.
+ * @see android.view.MotionEvent#ACTION_CANCEL
+ */
public static final int CANCEL = 3;
private Component pointerComponent;
@@ -1397,6 +1411,10 @@
return Math.abs(oldx - x) <= inaccuracy;
}
+ /**
+ * On ME4SE right-click button is kept down during mouse events
+ * @see javax.microedition.lcdui.ScmCanvas#mouseReleased(int, int, int, int)
+ */
private void pointerEvent(int type, int x, int y) {
//System.out.println("SM pointerEvent "+pointerComponent+" point="+type+" "+x+" "+y);
@@ -1435,7 +1453,7 @@
}
// check its dragged more then 5px
else if (!(isAccurate(pointerFirstX, x, inaccuracy) && isAccurate(pointerFirstY, y, inaccuracy))) {
- pointerComponent.processMouseEvent(CANCEL, x, y, keypad);
+ pointerComponent.processMouseEvent(CANCEL, 0, 0, keypad);
pointerComponent = null;
if (DEFAULT_NO_FOCUS) {
@@ -1444,23 +1462,18 @@
}
}
+ boolean simulateRightClick = false;
// When pointer released, reset pointer Component/ScrollPane
if (type == RELEASED) {
-
long time = System.currentTimeMillis();
// TODO we need a better way to decide when to open a popup that does not wait for the user to let go
- if (keypad.isDownKey(KeyEvent.KEY_RIGHT_CLICK) || (time - pointerFristTime > 1000 && isAccurate(pointerFirstX, x, inaccuracy) && isAccurate(pointerFirstY, y, inaccuracy))) {
- if (pointerComponent!=null) {
- Window popup = pointerComponent.getPopupMenu();
- if (popup!=null && !popup.isVisible()) {
- popup.show(pointerComponent, x, y);
-
- // as we have triggered a popup menu, we want to send this as a cancel to the component
- type = CANCEL;
- }
+ if (!keypad.isDownKey(KeyEvent.KEY_RIGHT_CLICK) && (time - pointerFristTime > 1000 && isAccurate(pointerFirstX, x, inaccuracy) && isAccurate(pointerFirstY, y, inaccuracy))) {
+ if (pointerComponent != null) {
+ // if this is a long press, simulate a right click for the component
+ keypad.keyPressed(KeyEvent.KEY_RIGHT_CLICK);
+ simulateRightClick = true;
}
}
-
}
// Handle events for pointer component
@@ -1471,6 +1484,10 @@
pc.processMouseEvent(type, pcX, pcY, keypad);
}
+ if (simulateRightClick) {
+ keypad.keyReleased(KeyEvent.KEY_RIGHT_CLICK);
+ }
+
// Handle events for pointer ScrollPane
if (pointerScrollPane != null) {
if (type == PRESSED || type == RELEASED ||
@@ -1492,7 +1509,7 @@
}
//#enddebug
- if (type == RELEASED || type==CANCEL) {
+ if (type == RELEASED) {
if (DEFAULT_NO_FOCUS) {
currentWindow.setNothingFocused();
@@ -1500,20 +1517,17 @@
pointerScrollPane = null;
pointerComponent = null;
-
}
+ }
+ if (type == PRESSED || type == RELEASED) {
+ showHideToolTip(type == PRESSED, pointerComponent);
}
-
- // TODO: if dragged by only a little bit, should not hide the tooltip
- showHideToolTip(type == PRESSED,pointerComponent);
-
}
catch (Throwable th) {
//#debug warn
Logger.warn("Exception in pointerEvent", th);
}
-
}
public void toast(String text) {
@@ -1526,7 +1540,7 @@
animateComponent(toast);
}
- private void showHideToolTip(boolean show,Component comp) {
+ private void showHideToolTip(boolean show, Component comp) {
// if a tooltip should be setup
if (show && comp != null && comp.getToolTipText() != null) {
@@ -1557,7 +1571,6 @@
tooltip.setLocation(x, y);
animateComponent(tooltip);
-
}
else if (tooltip != null) {
// this will never be null unless this method is called
@@ -1571,8 +1584,6 @@
}
}
}
-
-
}
public void setIndicatorText(String txt) {
@@ -1719,7 +1730,6 @@
sizeChangedImpl();
repaint();
-
}
protected void hideNotify() {
Modified: SwingME/src/net/yura/mobile/gui/KeyEvent.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/KeyEvent.java 2023-04-15 14:03:34 UTC (rev 2732)
+++ SwingME/src/net/yura/mobile/gui/KeyEvent.java 2023-04-26 12:14:15 UTC (rev 2733)
@@ -92,6 +92,7 @@
/**
* MS4SE Right Click Key
+ * @see java.awt.event.MouseEvent#isPopupTrigger()
*/
public static final int KEY_RIGHT_CLICK = -51;
Modified: SwingME/src/net/yura/mobile/gui/components/Button.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Button.java 2023-04-15 14:03:34 UTC (rev 2732)
+++ SwingME/src/net/yura/mobile/gui/components/Button.java 2023-04-26 12:14:15 UTC (rev 2733)
@@ -256,24 +256,26 @@
selected = true;
repaint();
}
- else if (x>=cx && x<=(cx+cw) && y>=cy && y<=(cy+ch)) {
+ else if (x>=cx && x<=(cx+cw) && y>=cy && y<=(cy+ch)) { // inside component
if (type == DesktopPane.DRAGGED && !selected) {
selected = true;
repaint();
}
+ else if (type == DesktopPane.CANCEL || isPopupTrigger(type, keys)) { // user scrolls or popup menu open
+ selected = oldState;
+ repaint();
+ }
else if (type == DesktopPane.RELEASED) {
selected = oldState;
fireActionPerformed();
repaint();
}
-
}
- else if (selected) { // && type == DesktopPane.DRAGGED
+ else if (selected) { // && type == DesktopPane.DRAGGED outside component
selected = oldState;
repaint();
}
-
}
/**
@@ -291,9 +293,8 @@
}
if (al!=null) {
- al.actionPerformed((actionCommand!=null)?actionCommand:getText());
+ al.actionPerformed(actionCommand != null ? actionCommand : getText());
}
-
}
/**
Modified: SwingME/src/net/yura/mobile/gui/components/Component.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Component.java 2023-04-15 14:03:34 UTC (rev 2732)
+++ SwingME/src/net/yura/mobile/gui/components/Component.java 2023-04-26 12:14:15 UTC (rev 2733)
@@ -218,7 +218,7 @@
*/
public boolean isFocusable() {
if (!isVisible()) return false;
- return focusable;
+ return focusable;
}
/**
@@ -491,16 +491,32 @@
}
/**
+ * @return true if the event has been consumed and should not trigger any more actions, usually when popupmenu is triggered.
* @see java.awt.Component#processMouseEvent(java.awt.event.MouseEvent) Component.processMouseEvent
+ * @see awt.event.InputEvent#consume()
*/
- public void processMouseEvent(int type, int x, int y, KeyEvent keys) {
+ public void processMouseEvent(int type, int x, int y, KeyEvent buttons) {
+
+ if (isPopupTrigger(type, buttons)) {
+ Window popup = getPopupMenu();
+ if (popup != null && !popup.isVisible()) {
+ // no action listener is called, if you want to customise menu, override getPopupMenu()
+ popup.show(this, x + getXOnScreen(), y + getYOnScreen());
+
+ // if we opened a popup menu, we do not want to open any parent popup menu
+ return;
+ }
+ }
+
if (focusable) {
if (type == DesktopPane.PRESSED) {
- if(!isFocusOwner() && isVisible()) { requestFocusInWindow(); }
+ if(!isFocusOwner() && isVisible()) {
+ requestFocusInWindow();
+ }
}
}
- else if (parent!=null) {
- parent.processMouseEvent(type,x+posX,y+posY, keys);
+ else if (parent != null) {
+ parent.processMouseEvent(type, posX + x, posY + y, buttons);
}
//else {
// owner.pointerEvent(type,x+getXInWindow(),y+getYInWindow());
@@ -507,6 +523,13 @@
//}
}
+ /**
+ * @see java.awt.event.MouseEvent#isPopupTrigger()
+ */
+ protected boolean isPopupTrigger(int type, KeyEvent buttons) {
+ return type == DesktopPane.RELEASED && buttons.isDownKey(KeyEvent.KEY_RIGHT_CLICK) && popup != null;
+ }
+
public void processMultitouchEvent(int[] type, int[] x, int[] y) {
if (parent!=null) {
for (int c=0;c<type.length;c++) {
@@ -517,8 +540,11 @@
}
}
+ /**
+ * @return if drag events should never go to a parent scrollpane, if this component wants them all
+ */
public boolean consumesMotionEvents() {
- if (parent!=null) {
+ if (parent != null) {
return parent.consumesMotionEvents();
}
return false;
@@ -903,15 +929,18 @@
* in Swing this is done by adding a MouseListener that will then fire the popup menu
* @see java.awt.Component#addMouseListener(java.awt.event.MouseListener) Component.addMouseListener
* @see java.awt.Component#add(java.awt.PopupMenu)
+ * @see javax.swing.JComponent#setComponentPopupMenu(javax.swing.JPopupMenu)
*/
public void setPopupMenu(Window component) {
popup = component;
}
+
/**
+ * Override this method to customise the content of the popup when it is triggered
* @see javax.swing.JMenu#getPopupMenu() JMenu.getPopupMenu
+ * @see javax.swing.JComponent#getComponentPopupMenu()
*/
public Window getPopupMenu() {
return popup;
}
-
}
Modified: SwingME/src/net/yura/mobile/gui/components/FrameTitlePane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/FrameTitlePane.java 2023-04-15 14:03:34 UTC (rev 2732)
+++ SwingME/src/net/yura/mobile/gui/components/FrameTitlePane.java 2023-04-26 12:14:15 UTC (rev 2733)
@@ -169,7 +169,6 @@
if (type == DesktopPane.PRESSED) {
oldX=x;
oldY=y;
-
}
else if (type == DesktopPane.DRAGGED) {
Frame owner = (Frame)getWindow();
@@ -177,7 +176,6 @@
move(owner,owner.getX()+(x-oldX),owner.getY()+(y-oldY));
}
}
-
}
private void move(Window owner,int x,int y) {
Modified: SwingME/src/net/yura/mobile/gui/components/ImageView.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/ImageView.java 2023-04-15 14:03:34 UTC (rev 2732)
+++ SwingME/src/net/yura/mobile/gui/components/ImageView.java 2023-04-26 12:14:15 UTC (rev 2733)
@@ -108,11 +108,6 @@
}
// Override
- public void processMouseEvent(int type, int x, int y, KeyEvent keys) {
- // We handle all our Mouse events
- }
-
- // Override
public void processMultitouchEvent(int[] type, int[] x, int[] y) {
consumingMotionEvents = (type[0] != DesktopPane.RELEASED );
Modified: SwingME/src/net/yura/mobile/gui/components/List.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/List.java 2023-04-15 14:03:34 UTC (rev 2732)
+++ SwingME/src/net/yura/mobile/gui/components/List.java 2023-04-26 12:14:15 UTC (rev 2733)
@@ -555,8 +555,10 @@
if (!isFocusable()) {
// if we are disabled then we do not do anything!
+ return;
}
- else if (type == DesktopPane.PRESSED || type == DesktopPane.DRAGGED) {
+
+ if (type == DesktopPane.PRESSED || type == DesktopPane.DRAGGED) {
int i = locationToIndex(x, y)[0];
if (i>=0) { // if (ri<0||ri>=size) { this check is not needed any more
@@ -566,11 +568,8 @@
setSelectedIndex(-1);
}
}
- else if (type == DesktopPane.RELEASED) {
+ else if (type == DesktopPane.RELEASED && !isPopupTrigger(type, keys) && !isCtrlKeyDown(keys)) {
- if (isCtrlKeyDown(keys)) {
- return;
- }
if (doubleClick) {
long time = System.currentTimeMillis();
@@ -788,7 +787,6 @@
//if we did not consume the event
return false;
}
-
}
/**
Modified: SwingME/src/net/yura/mobile/gui/components/Menu.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Menu.java 2023-04-15 14:03:34 UTC (rev 2732)
+++ SwingME/src/net/yura/mobile/gui/components/Menu.java 2023-04-26 12:14:15 UTC (rev 2733)
@@ -73,6 +73,12 @@
}
*/
+ // Override
+ protected boolean isPopupTrigger(int type, KeyEvent buttons) {
+ // do not trigger popup menus, just open menu as normal
+ return false;
+ }
+
public void fireActionPerformed() {
super.fireActionPerformed();
setPopupMenuVisible(true);
Modified: SwingME/src/net/yura/mobile/gui/components/Slider.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Slider.java 2023-04-15 14:03:34 UTC (rev 2732)
+++ SwingME/src/net/yura/mobile/gui/components/Slider.java 2023-04-26 12:14:15 UTC (rev 2733)
@@ -286,7 +286,7 @@
if (!focusable) return;
- if (type==DesktopPane.RELEASED) {
+ if (type == DesktopPane.RELEASED) {
click = 0;
}
else if (type == DesktopPane.PRESSED) {
@@ -362,7 +362,6 @@
setValue(newValue);
}
}
-
}
public boolean processKeyEvent(KeyEvent keypad) {
Modified: SwingME/src/net/yura/mobile/gui/components/Spinner.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Spinner.java 2023-04-15 14:03:34 UTC (rev 2732)
+++ SwingME/src/net/yura/mobile/gui/components/Spinner.java 2023-04-26 12:14:15 UTC (rev 2733)
@@ -142,14 +142,8 @@
}
fire();
}
- else if (type == DesktopPane.RELEASED) {
- if (leftPress || rightPress) {
- leftPress = false;
- rightPress = false;
- repaint();
- }
- }
- else if (type == DesktopPane.CANCEL) {
+ // if we started scrolling or opened a popup menu
+ else if (type == DesktopPane.CANCEL || isPopupTrigger(type, keys)) {
Object newVal=null;
if (leftPress) {
leftPress = false;
@@ -164,6 +158,13 @@
}
repaint();
}
+ else if (type == DesktopPane.RELEASED) {
+ if (leftPress || rightPress) {
+ leftPress = false;
+ rightPress = false;
+ repaint();
+ }
+ }
}
// public void setFocusable(boolean s) {
Modified: SwingME/src/net/yura/mobile/gui/components/TextComponent.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/TextComponent.java 2023-04-15 14:03:34 UTC (rev 2732)
+++ SwingME/src/net/yura/mobile/gui/components/TextComponent.java 2023-04-26 12:14:15 UTC (rev 2733)
@@ -282,7 +282,7 @@
public void processMouseEvent(int type, int x, int y, KeyEvent keys) {
boolean focusOwner = isFocusOwner();
super.processMouseEvent(type, x, y, keys);
- if (focusOwner && type==DesktopPane.PRESSED
+ if (focusOwner && type == DesktopPane.PRESSED
// && Midlet.getPlatform() != Midlet.PLATFORM_ME4SE) { // hacked me4se so this would not be needed (see javadoc)
) {
// TODO check if we have a qwerty keyboard
Modified: SwingME/src/net/yura/mobile/gui/components/Window.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Window.java 2023-04-15 14:03:34 UTC (rev 2732)
+++ SwingME/src/net/yura/mobile/gui/components/Window.java 2023-04-26 12:14:15 UTC (rev 2733)
@@ -251,8 +251,6 @@
) {
doClose();
}
-
-
}
public Component getComponentAt(final int xclick,final int yclick) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2023-04-15 14:03:37
|
Revision: 2732
http://sourceforge.net/p/swingme/code/2732
Author: yuranet
Date: 2023-04-15 14:03:34 +0000 (Sat, 15 Apr 2023)
Log Message:
-----------
escapeXml escapeHtml added
Modified Paths:
--------------
UtilME/src/net/yura/mobile/io/JSONUtil.java
UtilME/src_se/net/yura/io/JSONUtil.java
Added Paths:
-----------
UtilME/src_se/net/yura/io/XMLUtils.java
Modified: UtilME/src/net/yura/mobile/io/JSONUtil.java
===================================================================
--- UtilME/src/net/yura/mobile/io/JSONUtil.java 2023-04-13 16:21:54 UTC (rev 2731)
+++ UtilME/src/net/yura/mobile/io/JSONUtil.java 2023-04-15 14:03:34 UTC (rev 2732)
@@ -6,8 +6,6 @@
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Reader;
-import java.io.StringReader;
-import java.io.StringWriter;
import java.io.Writer;
import java.util.Enumeration;
import java.util.Hashtable;
@@ -43,26 +41,6 @@
save(new OutputStreamWriter(out, "UTF-8"), obj);
}
- public Object load(String text) {
- try {
- return load(new StringReader(text));
- }
- catch (IOException ex) {
- throw new IllegalArgumentException("bad json " + text);
- }
- }
-
- public String save(Object obj) {
- StringWriter writer = new StringWriter();
- try {
- save(writer, obj);
- }
- catch (IOException ex) {
- throw new IllegalArgumentException("bad object " + obj);
- }
- return writer.toString();
- }
-
protected void saveObject(JSONWriter serializer, Object object) throws IOException {
if (object == null) {
Modified: UtilME/src_se/net/yura/io/JSONUtil.java
===================================================================
--- UtilME/src_se/net/yura/io/JSONUtil.java 2023-04-13 16:21:54 UTC (rev 2731)
+++ UtilME/src_se/net/yura/io/JSONUtil.java 2023-04-15 14:03:34 UTC (rev 2732)
@@ -1,9 +1,10 @@
package net.yura.io;
import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import net.yura.mobile.io.json.JSONTokener;
@@ -16,6 +17,26 @@
useListForArray = true;
}
+ public Object load(String text) {
+ try {
+ return load(new StringReader(text));
+ }
+ catch (IOException ex) {
+ throw new IllegalArgumentException("bad json " + text);
+ }
+ }
+
+ public String save(Object obj) {
+ StringWriter writer = new StringWriter();
+ try {
+ save(writer, obj);
+ }
+ catch (IOException ex) {
+ throw new IllegalArgumentException("bad object " + obj);
+ }
+ return writer.toString();
+ }
+
protected Object readObject(JSONTokener x) throws IOException {
char c = x.nextClean();
x.back();
Added: UtilME/src_se/net/yura/io/XMLUtils.java
===================================================================
--- UtilME/src_se/net/yura/io/XMLUtils.java (rev 0)
+++ UtilME/src_se/net/yura/io/XMLUtils.java 2023-04-15 14:03:34 UTC (rev 2732)
@@ -0,0 +1,21 @@
+package net.yura.io;
+
+import net.yura.mobile.io.kxml2.KXmlSerializer;
+import java.io.IOException;
+import java.io.StringWriter;
+
+public class XMLUtils {
+
+ public static String escapeXml(String text) {
+ try {
+ KXmlSerializer serializer = new KXmlSerializer();
+ StringWriter writer = new StringWriter();
+ serializer.setOutput(writer);
+ serializer.text(text);
+ return writer.toString();
+ }
+ catch(IOException ex) {
+ throw new IllegalArgumentException("bad text: " + text, ex);
+ }
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2023-04-13 16:21:56
|
Revision: 2731
http://sourceforge.net/p/swingme/code/2731
Author: yuranet
Date: 2023-04-13 16:21:54 +0000 (Thu, 13 Apr 2023)
Log Message:
-----------
removed unused code and unused threads
Modified Paths:
--------------
AndroidME/src_Android/net/yura/android/AndroidMeActivity.java
AndroidME/src_Android/net/yura/android/AndroidMeApp.java
AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java
AndroidME/src_MIDP/javax/microedition/lcdui/Display.java
AndroidME/src_MIDP/javax/microedition/lcdui/Displayable.java
AndroidME/src_MIDP/javax/microedition/lcdui/TextBox.java
Modified: AndroidME/src_Android/net/yura/android/AndroidMeActivity.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeActivity.java 2023-04-01 13:18:14 UTC (rev 2730)
+++ AndroidME/src_Android/net/yura/android/AndroidMeActivity.java 2023-04-13 16:21:54 UTC (rev 2731)
@@ -60,13 +60,7 @@
Vector<String[]> jadMidlets = AndroidMeApp.getJadMidlets();
if (jadMidlets.size() == 1) {
- // Start MIDlet
- new Thread() {
- public void run() {
-// waitForDefaultView(); TODO:!!!!
- startMIDlet();
- }
- }.start();
+ startMIDlet();
}
else if (jadMidlets.size() > 1) {
ListView listView = new ListView(AndroidMeActivity.this);
@@ -91,27 +85,25 @@
}
public void startMIDlet() {
- // Needs to run on the UI thread, otherwise some of the API's will not start
- AndroidMeApp.getIntance().invokeLater(new Runnable() {
- public void run() {
- try {
- MIDlet midlet = AndroidMeApp.getMIDlet();
- Display display = Display.getDisplay(midlet);
- if (display.hiddenDisplay!=null) {
- display.setCurrent(display.hiddenDisplay);
- }
- midlet.doStartApp();
- onMidletStarted();
- }
- catch (Exception ex) {
- throw new RuntimeException("unable to start MIDlet: ", ex);
- }
+ try {
+ MIDlet midlet = AndroidMeApp.getMIDlet();
+ Display display = Display.getDisplay(midlet);
+ if (display.hiddenDisplay != null) {
+ display.setCurrent(display.hiddenDisplay);
}
- });
+ midlet.doStartApp();
+ onMidletStarted();
+ }
+ catch (Exception ex) {
+ throw new RuntimeException("unable to start MIDlet", ex);
+ }
}
+ /**
+ * hook for doing something after the midlet has been started
+ */
public void onMidletStarted() {
- // hook for doing something after the midlet has been started
+ // default implementation is empty
}
private boolean foreground;
@@ -263,8 +255,14 @@
try {
waitForDefaultView();
- AndroidMeApp.createMIDlet(midletClassName);
- startMIDlet();
+ // Needs to run on the UI thread, otherwise some of the API's will not start
+ AndroidMeApp.getIntance().invokeLater(new Runnable() {
+ public void run() {
+ AndroidMeApp.createMIDlet(midletClassName);
+ startMIDlet();
+ }
+ });
+
} catch (Throwable ex) {
Logger.warn("error starting " + midletClassName, ex);
}
Modified: AndroidME/src_Android/net/yura/android/AndroidMeApp.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeApp.java 2023-04-01 13:18:14 UTC (rev 2730)
+++ AndroidME/src_Android/net/yura/android/AndroidMeApp.java 2023-04-13 16:21:54 UTC (rev 2731)
@@ -48,21 +48,22 @@
return instance.midlet;
}
- // TODO: Async
- public static void createMIDlet(final String className) throws Exception {
+ /**
+ * Needs to run on the UI thread, otherwise some of the API's will not start
+ */
+ public static void createMIDlet(final String className) {
- // Needs to run on the UI thread, otherwise some of the API's will not start
- instance.handler.post(new Runnable() {
- public void run() {
- try {
- Class<?> midletClass = Class.forName(className);
- instance.midlet = (MIDlet) midletClass.newInstance();
- } catch (Exception ex) {
- throw new RuntimeException("unable to start MIDlet: "
- + className, ex);
- }
- }
- });
+ if (Thread.currentThread() != Looper.getMainLooper().getThread()) {
+ throw new IllegalStateException("not main thread");
+ }
+
+ try {
+ Class<?> midletClass = Class.forName(className);
+ instance.midlet = (MIDlet) midletClass.newInstance();
+ }
+ catch (Exception ex) {
+ throw new RuntimeException("unable to start MIDlet: " + className, ex);
+ }
}
public static void waitForMIDletCreation() {
@@ -106,7 +107,8 @@
String midletClassName = jadMidlets.elementAt(0)[2];
createMIDlet(midletClassName);
}
- } catch (Throwable e) {
+ }
+ catch (Throwable e) {
Logger.warn("error starting", e);
}
}
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java 2023-04-01 13:18:14 UTC (rev 2730)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java 2023-04-13 16:21:54 UTC (rev 2731)
@@ -72,8 +72,12 @@
}
+ /**
+ * in MIDP-2 this controls if the system displays the {@link Command} at the bottom of the screen
+ * Only fullscreen mode is supported on android as there are no soft keys.
+ */
public void setFullScreenMode(boolean fullScreen) {
- // do nothing, is this possible on android?
+ // do nothing
}
public int getGameAction(int keyCode) {
@@ -422,13 +426,6 @@
return linearLayout;
}
- @Override
- public void initDisplayable(MIDlet midlet) {
-// JP if (this.canvasView == null) {
-// this.canvasView = new CanvasView(midlet.getActivity());
-// }
- }
-
protected javax.microedition.lcdui.Graphics getGraphics() {
return this.canvasView.graphics;
}
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Display.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Display.java 2023-04-01 13:18:14 UTC (rev 2730)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Display.java 2023-04-13 16:21:54 UTC (rev 2731)
@@ -125,20 +125,12 @@
// TextBox is special... we don't really have any UI
if (newCurrent instanceof TextBox) {
- newCurrent.initDisplayable(null);
+ ((TextBox) newCurrent).initDisplayable();
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);
@@ -156,7 +148,6 @@
// Wait for the view to be set...
//YURA: remove this AndroidMeApp.getIntance().invokeAndWait(new Thread());
}
-
}
/**
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Displayable.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Displayable.java 2023-04-01 13:18:14 UTC (rev 2730)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Displayable.java 2023-04-13 16:21:54 UTC (rev 2731)
@@ -11,7 +11,6 @@
public abstract class Displayable {
protected CommandListener commandListener;
private Vector<Command> commands = new Vector<Command>();
- private Display currentDisplay;
public void addCommand(Command command) {
boolean added = false;
@@ -61,16 +60,6 @@
return h;//(h <= 0) ? AndroidMeActivity.DEFAULT_ACTIVITY.getScreenHeight() : h;
}
- public Display getCurrentDisplay() {
- return currentDisplay;
- }
-
- public void setCurrentDisplay(Display currentDisplay) {
- this.currentDisplay = currentDisplay;
- }
-
- public abstract void initDisplayable(MIDlet midlet);
-
public abstract View getView();
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/TextBox.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/TextBox.java 2023-04-01 13:18:14 UTC (rev 2730)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/TextBox.java 2023-04-13 16:21:54 UTC (rev 2731)
@@ -94,8 +94,7 @@
/**
* this is called so start the text entry by AndroidME
*/
- @Override
- public void initDisplayable(MIDlet midlet) {
+ public void initDisplayable() {
// we need to call this so the keyboard is opened
if (currentCanvasView != null) {
@@ -104,7 +103,6 @@
// need to call this after we bring the keyboard up, or that does not work
textBoxView.start(this);
-
}
public int getMaxSize() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2023-04-01 13:18:17
|
Revision: 2730
http://sourceforge.net/p/swingme/code/2730
Author: yuranet
Date: 2023-04-01 13:18:14 +0000 (Sat, 01 Apr 2023)
Log Message:
-----------
support ios 9 with scale 2
Modified Paths:
--------------
iOSME/src/javax/microedition/lcdui/Image.java
Modified: iOSME/src/javax/microedition/lcdui/Image.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Image.java 2023-03-30 00:59:20 UTC (rev 2729)
+++ iOSME/src/javax/microedition/lcdui/Image.java 2023-04-01 13:18:14 UTC (rev 2730)
@@ -117,33 +117,49 @@
double scale = img.scale();
double extraPointsNeeded = 1.0 / scale;
- // old API
- //UIKit.UIGraphicsBeginImageContextWithOptions(new CGSize(img.size().width() + extraPointsNeeded * 2.0, img.size().height() + extraPointsNeeded * 2.0), false, scale);
- //...
- //img = UIKit.UIGraphicsGetImageFromCurrentImageContext();
- //UIKit.UIGraphicsEndImageContext();
- //return img;
+ try {
+ // use new high level API (iOS 10)
+ UIGraphicsImageRendererFormat format = UIGraphicsImageRendererFormat.alloc().init();
+ format.setScale(scale);
+ format.setOpaque(false);
+ UIGraphicsImageRenderer render = UIGraphicsImageRenderer.alloc().initWithSizeFormat(new CGSize(img.size().width() + extraPointsNeeded * 2.0, img.size().height() + extraPointsNeeded * 2.0), format);
+ return render.imageWithActions(new UIGraphicsImageRenderer.Block_imageWithActions() {
+ @Override
+ public void call_imageWithActions(UIGraphicsImageRendererContext rendererContext) {
+ // draw center image
+ img.drawAtPoint(new CGPoint(extraPointsNeeded, extraPointsNeeded));
+ // draw top
+ drawRegion(img, 0, 0, img.size().width(), extraPointsNeeded, extraPointsNeeded, 0);
+ // draw bottom
+ drawRegion(img, 0, img.size().height() - extraPointsNeeded, img.size().width(), extraPointsNeeded, extraPointsNeeded, extraPointsNeeded + img.size().height());
+ // draw left
+ drawRegion(img, 0, 0, extraPointsNeeded, img.size().height(), 0, extraPointsNeeded);
+ // draw right
+ drawRegion(img, img.size().width() - extraPointsNeeded, 0, extraPointsNeeded, img.size().height(), extraPointsNeeded + img.size().width(), extraPointsNeeded);
+ }
+ });
+ }
+ catch (Throwable th) {
+ th.printStackTrace(System.out);
+ }
- // use new high level API instead
- UIGraphicsImageRendererFormat format = UIGraphicsImageRendererFormat.alloc().init();
- format.setScale(scale);
- format.setOpaque(false);
- UIGraphicsImageRenderer render = UIGraphicsImageRenderer.alloc().initWithSizeFormat(new CGSize(img.size().width() + extraPointsNeeded * 2.0, img.size().height() + extraPointsNeeded * 2.0), format);
- return render.imageWithActions(new UIGraphicsImageRenderer.Block_imageWithActions() {
- @Override
- public void call_imageWithActions(UIGraphicsImageRendererContext rendererContext) {
- // draw center image
- img.drawAtPoint(new CGPoint(extraPointsNeeded, extraPointsNeeded));
- // draw top
- drawRegion(img, 0, 0, img.size().width(), extraPointsNeeded, extraPointsNeeded, 0);
- // draw bottom
- drawRegion(img, 0, img.size().height() - extraPointsNeeded, img.size().width(), extraPointsNeeded, extraPointsNeeded, extraPointsNeeded + img.size().height());
- // draw left
- drawRegion(img, 0, 0, extraPointsNeeded, img.size().height(), 0, extraPointsNeeded);
- // draw right
- drawRegion(img, img.size().width() - extraPointsNeeded, 0, extraPointsNeeded, img.size().height(), extraPointsNeeded + img.size().width(), extraPointsNeeded);
- }
- });
+ // fallback to old API
+ UIKit.UIGraphicsBeginImageContextWithOptions(new CGSize(img.size().width() + extraPointsNeeded * 2.0, img.size().height() + extraPointsNeeded * 2.0), false, scale);
+
+ // draw center image
+ img.drawAtPoint(new CGPoint(extraPointsNeeded, extraPointsNeeded));
+ // draw top
+ drawRegion(img, 0, 0, img.size().width(), extraPointsNeeded, extraPointsNeeded, 0);
+ // draw bottom
+ drawRegion(img, 0, img.size().height() - extraPointsNeeded, img.size().width(), extraPointsNeeded, extraPointsNeeded, extraPointsNeeded + img.size().height());
+ // draw left
+ drawRegion(img, 0, 0, extraPointsNeeded, img.size().height(), 0, extraPointsNeeded);
+ // draw right
+ drawRegion(img, img.size().width() - extraPointsNeeded, 0, extraPointsNeeded, img.size().height(), extraPointsNeeded + img.size().width(), extraPointsNeeded);
+
+ UIImage newImg = UIKit.UIGraphicsGetImageFromCurrentImageContext();
+ UIKit.UIGraphicsEndImageContext();
+ return newImg;
}
private static void drawRegion(UIImage img, double xSrc, double ySrc, double width, double height, double xDst, double yDst) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2023-03-30 00:59:23
|
Revision: 2729
http://sourceforge.net/p/swingme/code/2729
Author: yuranet
Date: 2023-03-30 00:59:20 +0000 (Thu, 30 Mar 2023)
Log Message:
-----------
show disabled menu items correctly
Modified Paths:
--------------
iOSME/res/iOS_theme.xml
Modified: iOSME/res/iOS_theme.xml
===================================================================
--- iOSME/res/iOS_theme.xml 2023-03-28 00:34:09 UTC (rev 2728)
+++ iOSME/res/iOS_theme.xml 2023-03-30 00:59:20 UTC (rev 2729)
@@ -236,6 +236,6 @@
</state>
</style>
<bind style="list" key="List"/>
- <bind style="list" key="MenuBar"/>
+ <bind style="list" key="MenuRenderer"/>
</synth>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2023-03-28 00:34:11
|
Revision: 2728
http://sourceforge.net/p/swingme/code/2728
Author: yuranet
Date: 2023-03-28 00:34:09 +0000 (Tue, 28 Mar 2023)
Log Message:
-----------
typo fix and docs
Modified Paths:
--------------
iOSME/src/net/yura/ios/AppController.java
iOSME/src/net/yura/ios/CanvasView.java
Modified: iOSME/src/net/yura/ios/AppController.java
===================================================================
--- iOSME/src/net/yura/ios/AppController.java 2023-03-27 23:50:11 UTC (rev 2727)
+++ iOSME/src/net/yura/ios/AppController.java 2023-03-28 00:34:09 UTC (rev 2728)
@@ -33,7 +33,7 @@
private UIView renderer;
/**
- * this is only used oon old versions of iOS, where setAdditionalSafeAreaInsets is not supported.
+ * this is only used on old versions of iOS, where setAdditionalSafeAreaInsets is not supported.
*/
private NSLayoutConstraint bottomConstraint;
@@ -199,7 +199,7 @@
constrs = NSLayoutConstraint.constraintsWithVisualFormatOptionsMetricsViews(
"V:|[topGuide]-0-[renderer]-0-|", 0, (NSDictionary<String, Object>) NSDictionary.dictionary(), views);
view().addConstraints(constrs);
- bottomConstraint = (NSLayoutConstraint) constrs.get(2);
+ bottomConstraint = (NSLayoutConstraint) constrs.get(constrs.size() - 1);
}
view().layoutSubviews();
Modified: iOSME/src/net/yura/ios/CanvasView.java
===================================================================
--- iOSME/src/net/yura/ios/CanvasView.java 2023-03-27 23:50:11 UTC (rev 2727)
+++ iOSME/src/net/yura/ios/CanvasView.java 2023-03-28 00:34:09 UTC (rev 2728)
@@ -21,6 +21,26 @@
import apple.uikit.enums.UIViewContentMode;
import apple.uikit.protocol.UIKeyInput;
+/**
+ * from: https://discuss.multi-os-engine.org/t/cpu-usage-profiling/1326/2
+ * How to profile iOS app:
+ * <code>
+ * List<NSURL> l = (List<NSURL>) NSFileManager.defaultManager().
+ * URLsForDirectoryInDomains(
+ * NSSearchPathDirectory.DocumentDirectory,
+ * NSSearchPathDomainMask.UserDomainMask);
+ * NSURL docDirURL = l.get(0); // Error handling is for cowards :)
+ * String fsPath = docDirURL.fileSystemRepresentation();
+ * System.out.println("Trace log path: " + fsPath);
+ * Debug.startMethodTracingSampling(fsPath + "/MOE-sampling.trace", 0, 100);
+ * new Timer().schedule(new TimerTask() {
+ * @Override
+ * public void run() {
+ * Debug.stopMethodTracing();
+ * }
+ * }, 10000);
+ * </code>
+ */
public class CanvasView extends UIView implements UIKeyInput {
public static native CanvasView alloc();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2023-03-27 23:50:14
|
Revision: 2727
http://sourceforge.net/p/swingme/code/2727
Author: yuranet
Date: 2023-03-27 23:50:11 +0000 (Mon, 27 Mar 2023)
Log Message:
-----------
fix for keyboard on old iOS
Modified Paths:
--------------
iOSME/src/net/yura/ios/AppController.java
Modified: iOSME/src/net/yura/ios/AppController.java
===================================================================
--- iOSME/src/net/yura/ios/AppController.java 2023-03-26 12:45:19 UTC (rev 2726)
+++ iOSME/src/net/yura/ios/AppController.java 2023-03-27 23:50:11 UTC (rev 2727)
@@ -32,6 +32,11 @@
private UIView renderer;
+ /**
+ * this is only used oon old versions of iOS, where setAdditionalSafeAreaInsets is not supported.
+ */
+ private NSLayoutConstraint bottomConstraint;
+
public static native AppController alloc();
@Override
@@ -71,27 +76,33 @@
@Selector("keyboardWillShow:")
public void keyboardWillShow(NSNotification notification) {
double additionalSafeAreaBottom = getAdditionalSafeAreaBottom(notification);
- if (NSProcessInfo.processInfo().isOperatingSystemAtLeastVersion(IOS_11)) {
+ if (bottomConstraint == null) {
setAdditionalSafeAreaInsets(new UIEdgeInsets(0, 0, additionalSafeAreaBottom, 0));
}
- // TODO
+ else {
+ bottomConstraint.setConstant(additionalSafeAreaBottom);
+ }
}
@Selector("keyboardWillHide:")
public void keyboardWillHide(NSNotification notification) {
- if (NSProcessInfo.processInfo().isOperatingSystemAtLeastVersion(IOS_11)) {
+ if (bottomConstraint == null) {
setAdditionalSafeAreaInsets(UIKit.UIEdgeInsetsZero());
}
- // TODO
+ else {
+ bottomConstraint.setConstant(0.0);
+ }
}
@Selector("keyboardWillChange:")
public void keyboardWillChange(NSNotification notification) {
double additionalSafeAreaBottom = getAdditionalSafeAreaBottom(notification);
- if (NSProcessInfo.processInfo().isOperatingSystemAtLeastVersion(IOS_11)) {
+ if (bottomConstraint == null) {
setAdditionalSafeAreaInsets(new UIEdgeInsets(0, 0, additionalSafeAreaBottom, 0));
}
- // TODO
+ else {
+ bottomConstraint.setConstant(additionalSafeAreaBottom);
+ }
}
/*
@Selector("respondToSwipeGesture:")
@@ -164,6 +175,21 @@
renderer.leftAnchor().constraintEqualToAnchor(view().safeAreaLayoutGuide().leftAnchor()).setActive(true);
}
catch (Throwable th) {
+ /*
+
+H: (Horizontal) //horizontal direction
+V: (Vertical) //vertical direction
+| (pipe) //superview
+- (dash) //standard spacing (generally 8 points)
+[] (brackets) //name of the object (uilabel, unbutton, uiview, etc.)
+() (parentheses) //size of the object
+== equal widths //can be omitted
+-16- non standard spacing (16 points)
+<= less than or equal to
+>= greater than or equal to
+@250 priority of the constraint //can have any value between 0 and 1000
+
+ */
// fallback for old iOS
// code taken from MOE Planets sample: https://github.com/multi-os-engine/moe-samples-java/blob/moe-master/Planets/ios/src/main/java/org/moe/samples/planets/ios/PlanetsController.java
NSDictionary views = UIKit._NSDictionaryOfVariableBindings("topGuide,renderer", topLayoutGuide(), renderer);
@@ -173,6 +199,7 @@
constrs = NSLayoutConstraint.constraintsWithVisualFormatOptionsMetricsViews(
"V:|[topGuide]-0-[renderer]-0-|", 0, (NSDictionary<String, Object>) NSDictionary.dictionary(), views);
view().addConstraints(constrs);
+ bottomConstraint = (NSLayoutConstraint) constrs.get(2);
}
view().layoutSubviews();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2023-03-26 12:45:24
|
Revision: 2726
http://sourceforge.net/p/swingme/code/2726
Author: yuranet
Date: 2023-03-26 12:45:19 +0000 (Sun, 26 Mar 2023)
Log Message:
-----------
consume key events so they do not go to parent
Modified Paths:
--------------
me4se/src/org/me4se/scm/ScmWrapper.java
Modified: me4se/src/org/me4se/scm/ScmWrapper.java
===================================================================
--- me4se/src/org/me4se/scm/ScmWrapper.java 2023-03-13 17:58:16 UTC (rev 2725)
+++ me4se/src/org/me4se/scm/ScmWrapper.java 2023-03-26 12:45:19 UTC (rev 2726)
@@ -380,6 +380,10 @@
if (ev.getKeyCode() != KeyEvent.VK_ALT) {
menu = false;
}
+
+ // YURA we need to consume all keys, or this event will go to our parent,
+ // and if our parent is a tabbed pane, it may want to switch tab
+ ev.consume();
}
boolean keyDown;
boolean menu;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2023-03-13 17:58:17
|
Revision: 2725
http://sourceforge.net/p/swingme/code/2725
Author: yuranet
Date: 2023-03-13 17:58:16 +0000 (Mon, 13 Mar 2023)
Log Message:
-----------
take status bar into account in old iOS
Modified Paths:
--------------
iOSME/src/net/yura/ios/AppController.java
Modified: iOSME/src/net/yura/ios/AppController.java
===================================================================
--- iOSME/src/net/yura/ios/AppController.java 2023-03-11 18:08:54 UTC (rev 2724)
+++ iOSME/src/net/yura/ios/AppController.java 2023-03-13 17:58:16 UTC (rev 2725)
@@ -14,7 +14,9 @@
import apple.foundation.NSDictionary;
import apple.foundation.NSNotification;
import apple.foundation.NSNotificationCenter;
+import apple.foundation.NSProcessInfo;
import apple.foundation.NSValue;
+import apple.foundation.struct.NSOperatingSystemVersion;
import apple.uikit.NSLayoutConstraint;
import apple.uikit.UIApplication;
import apple.uikit.UIView;
@@ -26,6 +28,8 @@
@RegisterOnStartup
public class AppController extends UIViewController {
+ private static final NSOperatingSystemVersion IOS_11 = new NSOperatingSystemVersion(11, 0, 0);
+
private UIView renderer;
public static native AppController alloc();
@@ -66,17 +70,28 @@
@Selector("keyboardWillShow:")
public void keyboardWillShow(NSNotification notification) {
- setAdditionalSafeAreaInsets(new UIEdgeInsets(0, 0, getAdditionalSafeAreaBottom(notification), 0));
+ double additionalSafeAreaBottom = getAdditionalSafeAreaBottom(notification);
+ if (NSProcessInfo.processInfo().isOperatingSystemAtLeastVersion(IOS_11)) {
+ setAdditionalSafeAreaInsets(new UIEdgeInsets(0, 0, additionalSafeAreaBottom, 0));
+ }
+ // TODO
}
@Selector("keyboardWillHide:")
public void keyboardWillHide(NSNotification notification) {
- setAdditionalSafeAreaInsets(UIKit.UIEdgeInsetsZero());
+ if (NSProcessInfo.processInfo().isOperatingSystemAtLeastVersion(IOS_11)) {
+ setAdditionalSafeAreaInsets(UIKit.UIEdgeInsetsZero());
+ }
+ // TODO
}
@Selector("keyboardWillChange:")
public void keyboardWillChange(NSNotification notification) {
- setAdditionalSafeAreaInsets(new UIEdgeInsets(0, 0, getAdditionalSafeAreaBottom(notification), 0));
+ double additionalSafeAreaBottom = getAdditionalSafeAreaBottom(notification);
+ if (NSProcessInfo.processInfo().isOperatingSystemAtLeastVersion(IOS_11)) {
+ setAdditionalSafeAreaInsets(new UIEdgeInsets(0, 0, additionalSafeAreaBottom, 0));
+ }
+ // TODO
}
/*
@Selector("respondToSwipeGesture:")
@@ -88,7 +103,13 @@
*/
private double getAdditionalSafeAreaBottom(NSNotification notification) {
double keyboardHeight = ((NSValue)notification.userInfo().get(UIKit.UIKeyboardFrameEndUserInfoKey())).CGRectValue().size().height();
- double bottomPadding = UIApplication.sharedApplication().keyWindow().safeAreaInsets().bottom();
+ double bottomPadding;
+ if (NSProcessInfo.processInfo().isOperatingSystemAtLeastVersion(IOS_11)) {
+ bottomPadding = UIApplication.sharedApplication().keyWindow().safeAreaInsets().bottom();
+ }
+ else {
+ bottomPadding = 0;
+ }
return keyboardHeight - bottomPadding;
}
@@ -145,12 +166,12 @@
catch (Throwable th) {
// fallback for old iOS
// code taken from MOE Planets sample: https://github.com/multi-os-engine/moe-samples-java/blob/moe-master/Planets/ios/src/main/java/org/moe/samples/planets/ios/PlanetsController.java
- NSDictionary views = NSDictionary.dictionaryWithObjectForKey(renderer, "renderer");
+ NSDictionary views = UIKit._NSDictionaryOfVariableBindings("topGuide,renderer", topLayoutGuide(), renderer);
NSArray constrs = NSLayoutConstraint.constraintsWithVisualFormatOptionsMetricsViews(
"|-0-[renderer]-0-|", 0, (NSDictionary<String, Object>) NSDictionary.dictionary(), views);
view().addConstraints(constrs);
constrs = NSLayoutConstraint.constraintsWithVisualFormatOptionsMetricsViews(
- "V:|-0-[renderer]-0-|", 0, (NSDictionary<String, Object>) NSDictionary.dictionary(), views);
+ "V:|[topGuide]-0-[renderer]-0-|", 0, (NSDictionary<String, Object>) NSDictionary.dictionary(), views);
view().addConstraints(constrs);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2023-03-11 18:08:56
|
Revision: 2724
http://sourceforge.net/p/swingme/code/2724
Author: yuranet
Date: 2023-03-11 18:08:54 +0000 (Sat, 11 Mar 2023)
Log Message:
-----------
run on all iOS versions
Modified Paths:
--------------
iOSME/src/net/yura/ios/AppController.java
iOSME/src/net/yura/ios/iOSNotifications.java
Modified: iOSME/src/net/yura/ios/AppController.java
===================================================================
--- iOSME/src/net/yura/ios/AppController.java 2023-03-09 21:54:51 UTC (rev 2723)
+++ iOSME/src/net/yura/ios/AppController.java 2023-03-11 18:08:54 UTC (rev 2724)
@@ -9,10 +9,13 @@
import javax.microedition.lcdui.Display;
import javax.microedition.lcdui.Displayable;
import javax.microedition.midlet.MIDlet;
+import apple.foundation.NSArray;
import apple.foundation.NSCoder;
+import apple.foundation.NSDictionary;
import apple.foundation.NSNotification;
import apple.foundation.NSNotificationCenter;
import apple.foundation.NSValue;
+import apple.uikit.NSLayoutConstraint;
import apple.uikit.UIApplication;
import apple.uikit.UIView;
import apple.uikit.UIViewController;
@@ -131,22 +134,26 @@
view().addConstraint(constraint);
*/
-/*
- NSDictionary views = NSDictionary.dictionaryWithObjectForKey(renderer, "renderer");
- NSArray constrs = NSLayoutConstraint.constraintsWithVisualFormatOptionsMetricsViews(
- "|-0-[renderer]-0-|", 0, (NSDictionary<String, Object>) NSDictionary.dictionary(), views);
- view().addConstraints(constrs);
- constrs = NSLayoutConstraint.constraintsWithVisualFormatOptionsMetricsViews(
- "V:|-0-[renderer]-0-|", 0, (NSDictionary<String, Object>) NSDictionary.dictionary(), views);
- view().addConstraints(constrs);
-*/
+ try {
+ // safeAreaLayoutGuide was added in iOS 11
+ // TODO when running on M1 mac there is a bug: https://github.com/th3rdwave/react-native-safe-area-context/issues/210
+ renderer.bottomAnchor().constraintEqualToAnchor(view().safeAreaLayoutGuide().bottomAnchor()).setActive(true);
+ renderer.topAnchor().constraintEqualToAnchor(view().safeAreaLayoutGuide().topAnchor()).setActive(true);
+ renderer.rightAnchor().constraintEqualToAnchor(view().safeAreaLayoutGuide().rightAnchor()).setActive(true);
+ renderer.leftAnchor().constraintEqualToAnchor(view().safeAreaLayoutGuide().leftAnchor()).setActive(true);
+ }
+ catch (Throwable th) {
+ // fallback for old iOS
+ // code taken from MOE Planets sample: https://github.com/multi-os-engine/moe-samples-java/blob/moe-master/Planets/ios/src/main/java/org/moe/samples/planets/ios/PlanetsController.java
+ NSDictionary views = NSDictionary.dictionaryWithObjectForKey(renderer, "renderer");
+ NSArray constrs = NSLayoutConstraint.constraintsWithVisualFormatOptionsMetricsViews(
+ "|-0-[renderer]-0-|", 0, (NSDictionary<String, Object>) NSDictionary.dictionary(), views);
+ view().addConstraints(constrs);
+ constrs = NSLayoutConstraint.constraintsWithVisualFormatOptionsMetricsViews(
+ "V:|-0-[renderer]-0-|", 0, (NSDictionary<String, Object>) NSDictionary.dictionary(), views);
+ view().addConstraints(constrs);
+ }
- // TODO when running on M1 mac there is a bug: https://github.com/th3rdwave/react-native-safe-area-context/issues/210
- renderer.bottomAnchor().constraintEqualToAnchor(view().safeAreaLayoutGuide().bottomAnchor()).setActive(true);
- renderer.topAnchor().constraintEqualToAnchor(view().safeAreaLayoutGuide().topAnchor()).setActive(true);
- renderer.rightAnchor().constraintEqualToAnchor(view().safeAreaLayoutGuide().rightAnchor()).setActive(true);
- renderer.leftAnchor().constraintEqualToAnchor(view().safeAreaLayoutGuide().leftAnchor()).setActive(true);
-
view().layoutSubviews();
}
Modified: iOSME/src/net/yura/ios/iOSNotifications.java
===================================================================
--- iOSME/src/net/yura/ios/iOSNotifications.java 2023-03-09 21:54:51 UTC (rev 2723)
+++ iOSME/src/net/yura/ios/iOSNotifications.java 2023-03-11 18:08:54 UTC (rev 2724)
@@ -4,9 +4,11 @@
import javax.microedition.midlet.MIDlet;
import apple.foundation.NSError;
import apple.foundation.NSNumber;
+import apple.foundation.NSURL;
import apple.uikit.UIApplication;
import apple.usernotifications.UNMutableNotificationContent;
import apple.usernotifications.UNNotification;
+import apple.usernotifications.UNNotificationAttachment;
import apple.usernotifications.UNNotificationContent;
import apple.usernotifications.UNNotificationRequest;
import apple.usernotifications.UNNotificationResponse;
@@ -24,11 +26,18 @@
public static final String NOTIFICATION_AUTHORIZATION_STATUS = "iosNotificationSetting";
public static void init() {
- // this is needed to allow showing local notifications when the app is in foreground.
- UNUserNotificationCenter notificationCenter = UNUserNotificationCenter.currentNotificationCenter();
- notificationCenter.setDelegate(new iOSNotifications());
+ try {
+ // if (NSProcessInfo.processInfo().isOperatingSystemAtLeastVersion(new NSOperatingSystemVersion(10, 0, 0))) {
+ // this is needed to allow showing local notifications when the app is in foreground.
+ UNUserNotificationCenter notificationCenter = UNUserNotificationCenter.currentNotificationCenter(); // iOS 10
+ notificationCenter.setDelegate(new iOSNotifications());
- checkNotificationAuthorization();
+ checkNotificationAuthorization();
+ }
+ catch (Throwable th) {
+ // if anything goes wrong with starting the notification system, we do not want to kill the whole app
+ th.printStackTrace();
+ }
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2023-03-09 21:54:52
|
Revision: 2723
http://sourceforge.net/p/swingme/code/2723
Author: yuranet
Date: 2023-03-09 21:54:51 +0000 (Thu, 09 Mar 2023)
Log Message:
-----------
fix for crash on ipad when sharing file
Modified Paths:
--------------
iOSME/src/javax/microedition/lcdui/Canvas.java
iOSME/src/javax/microedition/lcdui/Graphics.java
iOSME/src/javax/microedition/lcdui/Image.java
iOSME/src/javax/microedition/midlet/MIDlet.java
iOSME/src/net/yura/ios/SwingMEiOSApplication.java
Modified: iOSME/src/javax/microedition/lcdui/Canvas.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Canvas.java 2023-03-05 12:59:56 UTC (rev 2722)
+++ iOSME/src/javax/microedition/lcdui/Canvas.java 2023-03-09 21:54:51 UTC (rev 2723)
@@ -5,12 +5,10 @@
import net.yura.ios.iOSUtil;
import java.util.ArrayList;
import java.util.List;
-import apple.coregraphics.struct.CGPoint;
+import apple.coregraphics.c.CoreGraphics;
import apple.coregraphics.struct.CGRect;
-import apple.coregraphics.struct.CGSize;
import apple.foundation.NSOperationQueue;
import apple.foundation.NSThread;
-import apple.uikit.UIView;
public abstract class Canvas extends Displayable {
@@ -157,7 +155,7 @@
private final List<CGRect> repaintsQueue = new ArrayList();
public void repaint(int x, int y, int w, int h) {
- CGRect rect = new CGRect(new CGPoint(x, y), new CGSize(w, h));
+ CGRect rect = CoreGraphics.CGRectMake(x, y, w, h);
// we can only ever call setNeedsDisplay from main thread or it does nothing
if (NSThread.isMainThread_static() && !painting) {
canvasView.setNeedsDisplayInRect(rect);
@@ -266,7 +264,7 @@
Font font = graphics.getFont();
int fontH = font.getHeight() + 4;
int fontW = font.stringWidth("99.9fps") + 4;
- fpsRect = new CGRect(new CGPoint(x, y), new CGSize(fontW, fontH));
+ fpsRect = CoreGraphics.CGRectMake(x, y, fontW, fontH);
}
graphics.setColor(0xFF000000);
Modified: iOSME/src/javax/microedition/lcdui/Graphics.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Graphics.java 2023-03-05 12:59:56 UTC (rev 2722)
+++ iOSME/src/javax/microedition/lcdui/Graphics.java 2023-03-09 21:54:51 UTC (rev 2723)
@@ -3,7 +3,6 @@
import apple.coregraphics.c.CoreGraphics;
import apple.coregraphics.opaque.CGColorRef;
import apple.coregraphics.opaque.CGContextRef;
-import apple.coregraphics.opaque.CGFontRef;
import apple.coregraphics.opaque.CGImageRef;
import apple.coregraphics.struct.CGAffineTransform;
import apple.coregraphics.struct.CGPoint;
@@ -28,7 +27,6 @@
import android.graphics.ColorMatrix;
import org.moe.natj.general.ptr.NFloatPtr;
import org.moe.natj.general.ptr.impl.PtrFactory;
-import org.moe.natj.objc.ObjCRuntime;
public class Graphics {
public static final int BASELINE = 64;
@@ -194,11 +192,11 @@
}
private CGRect getDestRect(int x, int y, int width, int height) {
- return new CGRect(new CGPoint(tx + x, ty + y), new CGSize(width, height));
+ return CoreGraphics.CGRectMake(tx + x, ty + y, width, height);
}
private CGRect getDrawRect(int x, int y, int width, int height) {
- return new CGRect(new CGPoint(tx + x + 0.5, ty + y + 0.5), new CGSize(width, height));
+ return CoreGraphics.CGRectMake(tx + x + 0.5, ty + y + 0.5, width, height);
}
public void drawRect(int x, int y, int width, int height) {
@@ -485,7 +483,7 @@
}
public void drawInRect(UIImage uiImageToDraw, int x, int y, int width, int height, CGAffineTransform affineTransform) {
- CGRect rect = new CGRect(new CGPoint(x, y), new CGSize(width, height));
+ CGRect rect = CoreGraphics.CGRectMake(x, y, width, height);
boolean same = isCurrentContext();
if (!same) UIKit.UIGraphicsPushContext(context);
Modified: iOSME/src/javax/microedition/lcdui/Image.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Image.java 2023-03-05 12:59:56 UTC (rev 2722)
+++ iOSME/src/javax/microedition/lcdui/Image.java 2023-03-09 21:54:51 UTC (rev 2723)
@@ -150,7 +150,7 @@
CGContextRef context = UIKit.UIGraphicsGetCurrentContext();
CGRect oldClip = CoreGraphics.CGContextGetClipBoundingBox(context);
- CGRect clip = new CGRect(new CGPoint(xDst, yDst), new CGSize(width, height));
+ CGRect clip = CoreGraphics.CGRectMake(xDst, yDst, width, height);
CoreGraphics.CGContextClipToRect(context, clip);
img.drawAtPoint(new CGPoint(xDst - xSrc, yDst - ySrc));
@@ -307,7 +307,7 @@
public UIImage getUIImage(int xSrc, int ySrc, int width, int height, int transform) {
UIImage start = getUIImage();
double scale = start.scale();
- CGRect srcRect = new CGRect(new CGPoint(scale * xSrc, scale * ySrc), new CGSize(scale * width, scale * height));
+ CGRect srcRect = CoreGraphics.CGRectMake(scale * xSrc, scale * ySrc, scale * width, scale * height);
CGImageRef cropped = CoreGraphics.CGImageCreateWithImageInRect(start.CGImage(), srcRect);
UIImage transformed;
Modified: iOSME/src/javax/microedition/midlet/MIDlet.java
===================================================================
--- iOSME/src/javax/microedition/midlet/MIDlet.java 2023-03-05 12:59:56 UTC (rev 2722)
+++ iOSME/src/javax/microedition/midlet/MIDlet.java 2023-03-09 21:54:51 UTC (rev 2723)
@@ -9,7 +9,9 @@
import java.net.URLConnection;
import java.util.Map;
import javax.microedition.io.ConnectionNotFoundException;
+import javax.microedition.lcdui.Display;
import apple.c.Globals;
+import apple.coregraphics.c.CoreGraphics;
import apple.foundation.NSArray;
import apple.foundation.NSBundle;
import apple.foundation.NSData;
@@ -22,6 +24,8 @@
import apple.uikit.UIApplication;
import apple.uikit.UINavigationController;
import apple.uikit.UIPasteboard;
+import apple.uikit.UIPopoverPresentationController;
+import apple.uikit.UIView;
import apple.uikit.UIViewController;
import apple.uikit.enums.UIApplicationState;
@@ -280,11 +284,22 @@
else {
// no idea how to make this work
//UIDocumentInteractionController docController = UIDocumentInteractionController.interactionControllerWithURL(attachment);
- //boolean worked = docController.presentOptionsMenuFromRectInViewAnimated(new CGRect(new CGPoint(150,150), new CGSize(320, 568)), UIApplication.sharedApplication().keyWindow(), true);
+ //boolean worked = docController.presentOptionsMenuFromRectInViewAnimated(CoreGraphics.CGRectMake(150, 150, 320, 568), UIApplication.sharedApplication().keyWindow(), true);
// TODO this works well, but we can also add other info into it like subject, etc.
NSURL attachment = NSURL.fileURLWithPath(query.get("attachment"));
UIActivityViewController activityViewController = UIActivityViewController.alloc().initWithActivityItemsApplicationActivities(NSArray.arrayWithObject(attachment), null);
+
+ // This is NEEDED for iPad! or else it will crash!
+ UIPopoverPresentationController popoverPresentationController = activityViewController.popoverPresentationController();
+ if (popoverPresentationController != null) {
+ UIView view = Display.getDisplay(this).getCurrent().getView();
+ popoverPresentationController.setSourceView(view);
+ // because this view is fullscreen, it is not good enough and will confuse the iOS constraints system
+ // so instead we give it an area that will for sure always be both onscreen and have space near it
+ popoverPresentationController.setSourceRect(CoreGraphics.CGRectMake(0, 0, 50, 50));
+ }
+
rootViewController.presentViewControllerAnimatedCompletion(activityViewController, true, null);
}
}
Modified: iOSME/src/net/yura/ios/SwingMEiOSApplication.java
===================================================================
--- iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2023-03-05 12:59:56 UTC (rev 2722)
+++ iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2023-03-09 21:54:51 UTC (rev 2723)
@@ -95,6 +95,8 @@
String documentsDirectory = (String)appData.objectAtIndex(0);
System.setProperty("user.home", documentsDirectory);
+ // issue: https://github.com/multi-os-engine/multi-os-engine/issues/183
+ // maybe this should be apple.foundation.c.Foundation.NSTemporaryDirectory();
NSArray tmpData = Foundation.NSSearchPathForDirectoriesInDomains(NSSearchPathDirectory.CachesDirectory, NSSearchPathDomainMask.UserDomainMask, true);
String cachesDirectory = (String)tmpData.objectAtIndex(0);
System.setProperty("java.io.tmpdir", cachesDirectory);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2023-03-05 12:59:59
|
Revision: 2722
http://sourceforge.net/p/swingme/code/2722
Author: yuranet
Date: 2023-03-05 12:59:56 +0000 (Sun, 05 Mar 2023)
Log Message:
-----------
file io consistent
Modified Paths:
--------------
AndroidME/src_Android/net/yura/android/io/AndroidAssetConnection.java
SwingME/src_se/net/yura/midp/io/JavaFileConnection.java
iOSME/src/net/yura/ios/BundleConnection.java
Modified: AndroidME/src_Android/net/yura/android/io/AndroidAssetConnection.java
===================================================================
--- AndroidME/src_Android/net/yura/android/io/AndroidAssetConnection.java 2023-03-04 17:27:58 UTC (rev 2721)
+++ AndroidME/src_Android/net/yura/android/io/AndroidAssetConnection.java 2023-03-05 12:59:56 UTC (rev 2722)
@@ -29,7 +29,7 @@
@Override
public long availableSize() {
- return 0;
+ return -1;
}
@Override
@@ -206,7 +206,7 @@
@Override
public long totalSize() {
- return 0;
+ return -1;
}
@Override
@@ -216,7 +216,7 @@
@Override
public long usedSize() {
- return 0;
+ return -1;
}
private static AssetManager getAssetManager() {
Modified: SwingME/src_se/net/yura/midp/io/JavaFileConnection.java
===================================================================
--- SwingME/src_se/net/yura/midp/io/JavaFileConnection.java 2023-03-04 17:27:58 UTC (rev 2721)
+++ SwingME/src_se/net/yura/midp/io/JavaFileConnection.java 2023-03-05 12:59:56 UTC (rev 2722)
@@ -66,8 +66,13 @@
// Override
public long availableSize() {
- // this isn't available
- return -1;
+ try {
+ return this.file.getUsableSpace();
+ }
+ catch (Throwable th) {
+ // this isn't available
+ return -1;
+ }
}
// Override
Modified: iOSME/src/net/yura/ios/BundleConnection.java
===================================================================
--- iOSME/src/net/yura/ios/BundleConnection.java 2023-03-04 17:27:58 UTC (rev 2721)
+++ iOSME/src/net/yura/ios/BundleConnection.java 2023-03-05 12:59:56 UTC (rev 2722)
@@ -28,7 +28,7 @@
*/
@Override
public long availableSize() {
- return -1;
+ return -1; // path.getUsableSpace();
}
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2023-03-04 17:28:00
|
Revision: 2721
http://sourceforge.net/p/swingme/code/2721
Author: yuranet
Date: 2023-03-04 17:27:58 +0000 (Sat, 04 Mar 2023)
Log Message:
-----------
call correct method
Modified Paths:
--------------
SwingME/src_se/net/yura/midp/io/JavaFileConnection.java
iOSME/src/net/yura/ios/BundleConnection.java
Modified: SwingME/src_se/net/yura/midp/io/JavaFileConnection.java
===================================================================
--- SwingME/src_se/net/yura/midp/io/JavaFileConnection.java 2023-03-04 11:29:05 UTC (rev 2720)
+++ SwingME/src_se/net/yura/midp/io/JavaFileConnection.java 2023-03-04 17:27:58 UTC (rev 2721)
@@ -295,17 +295,27 @@
// Override
public long totalSize() {
- return this.file.length();
+ try {
+ return this.file.getTotalSpace();
+ }
+ catch (Throwable th) {
+ return -1;
+ }
}
// Override
- public void truncate(long byteOffset) throws IOException {
- throw new IOException("unsupported");
+ public long usedSize() {
+ try {
+ return this.file.getTotalSpace() - this.file.getFreeSpace();
+ }
+ catch (Throwable th) {
+ return -1;
+ }
}
// Override
- public long usedSize() {
- return this.file.length();
+ public void truncate(long byteOffset) throws IOException {
+ throw new IOException("unsupported");
}
// Override
Modified: iOSME/src/net/yura/ios/BundleConnection.java
===================================================================
--- iOSME/src/net/yura/ios/BundleConnection.java 2023-03-04 11:29:05 UTC (rev 2720)
+++ iOSME/src/net/yura/ios/BundleConnection.java 2023-03-04 17:27:58 UTC (rev 2721)
@@ -183,9 +183,12 @@
throw new SecurityException("not not write here");
}
+ /**
+ * @return -1 if the file system is not accessible.
+ */
@Override
public long totalSize() {
- return path.getTotalSpace();
+ return -1; // path.getTotalSpace();
}
@Override
@@ -198,7 +201,7 @@
*/
@Override
public long usedSize() {
- return -1;
+ return -1; // path.getTotalSpace() - path.getFreeSpace();
}
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2023-03-04 11:29:08
|
Revision: 2720
http://sourceforge.net/p/swingme/code/2720
Author: yuranet
Date: 2023-03-04 11:29:05 +0000 (Sat, 04 Mar 2023)
Log Message:
-----------
scrollToTop works
Modified Paths:
--------------
iOSME/src/net/yura/ios/SwingMEiOSApplication.java
Added Paths:
-----------
iOSME/src/net/yura/ios/ScrollToTopGestureRecognizer.java
Added: iOSME/src/net/yura/ios/ScrollToTopGestureRecognizer.java
===================================================================
--- iOSME/src/net/yura/ios/ScrollToTopGestureRecognizer.java (rev 0)
+++ iOSME/src/net/yura/ios/ScrollToTopGestureRecognizer.java 2023-03-04 11:29:05 UTC (rev 2720)
@@ -0,0 +1,58 @@
+package net.yura.ios;
+
+import net.yura.mobile.gui.DesktopPane;
+import net.yura.mobile.gui.components.Component;
+import net.yura.mobile.gui.components.Panel;
+import net.yura.mobile.gui.components.ScrollPane;
+import net.yura.mobile.gui.components.Window;
+import java.util.List;
+import apple.coregraphics.c.CoreGraphics;
+import apple.coregraphics.struct.CGPoint;
+import apple.coregraphics.struct.CGRect;
+import apple.coregraphics.struct.CGSize;
+import apple.uikit.UIScreen;
+import apple.uikit.UIScrollView;
+import apple.uikit.UIViewController;
+import apple.uikit.protocol.UIScrollViewDelegate;
+
+public class ScrollToTopGestureRecognizer implements UIScrollViewDelegate {
+
+ public static void init(UIViewController vc) {
+
+ // for unknown reasons, the UIScrollView needs to have the width of the screen
+ UIScrollView scrollView = UIScrollView.alloc().initWithFrame(new CGRect(CoreGraphics.CGPointZero(),
+ new CGSize(UIScreen.mainScreen().bounds().size().width(),0)));
+
+ scrollView.setDelegate(new ScrollToTopGestureRecognizer());
+ scrollView.setContentSize(new CGSize(0.0f,1.0f));
+ scrollView.setContentOffsetAnimated(new CGPoint(0.0f,1.0f), false);
+ vc.view().addSubview(scrollView);
+ }
+
+ @Override
+ public boolean scrollViewShouldScrollToTop(UIScrollView ignore) {
+ Window window = DesktopPane.getDesktopPane().getSelectedFrame();
+ ScrollPane scrollPane = findScrollPane(window);
+ if (scrollPane != null) {
+ scrollPane.getView().setLocation(scrollPane.getView().getX(), scrollPane.getViewPortY());
+ scrollPane.repaint();
+ }
+ return false;
+ }
+
+ private ScrollPane findScrollPane(Panel panel) {
+ List<Component> components = panel.getComponents();
+ for (Component component : components) {
+ if (component instanceof ScrollPane && ((Panel) component).getComponentCount() == 1 && ((ScrollPane) component).getViewPortY() != ((ScrollPane) component).getView().getY()) {
+ return (ScrollPane)component;
+ }
+ else if (component instanceof Panel) {
+ ScrollPane scrollPane = findScrollPane((Panel)component);
+ if (scrollPane != null) {
+ return scrollPane;
+ }
+ }
+ }
+ return null;
+ }
+}
Modified: iOSME/src/net/yura/ios/SwingMEiOSApplication.java
===================================================================
--- iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2023-03-04 01:43:03 UTC (rev 2719)
+++ iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2023-03-04 11:29:05 UTC (rev 2720)
@@ -75,7 +75,7 @@
iOSNotifications.init();
NativeTextEntry.init();
- //ScrollToTopGestureRecognizer.init(vc);
+ ScrollToTopGestureRecognizer.init(vc);
NSBundle mainBundle = NSBundle.mainBundle();
String mainClass = (String)mainBundle.objectForInfoDictionaryKey("SwingME.Main.Class");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2023-03-04 01:43:12
|
Revision: 2719
http://sourceforge.net/p/swingme/code/2719
Author: yuranet
Date: 2023-03-04 01:43:03 +0000 (Sat, 04 Mar 2023)
Log Message:
-----------
more correct order of calling init methods
Modified Paths:
--------------
iOSME/src/javax/microedition/lcdui/Canvas.java
iOSME/src/javax/microedition/lcdui/Display.java
iOSME/src/javax/microedition/lcdui/Screen.java
iOSME/src/javax/microedition/lcdui/TextBox.java
iOSME/src/net/yura/ios/AppController.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 2023-03-02 18:38:01 UTC (rev 2718)
+++ iOSME/src/javax/microedition/lcdui/Canvas.java 2023-03-04 01:43:03 UTC (rev 2719)
@@ -38,8 +38,8 @@
public static final int KEY_STAR = 42;
public static final int KEY_POUND = 35;
- CanvasView canvasView;
- boolean showFPS = "true".equals(System.getProperty("debug"));
+ private CanvasView canvasView;
+ private boolean showFPS = "true".equals(System.getProperty("debug"));
protected Canvas() {
@@ -313,12 +313,12 @@
if (canvasView == null) {
canvasView = CanvasView.alloc().initWithFrame(controller.view().bounds());
canvasView.setCanvas(this);
- controller.setRendererView(canvasView);
}
+ controller.setRendererView(canvasView);
}
@Override
- public UIView getView() {
+ public CanvasView getView() {
return canvasView;
}
Modified: iOSME/src/javax/microedition/lcdui/Display.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Display.java 2023-03-02 18:38:01 UTC (rev 2718)
+++ iOSME/src/javax/microedition/lcdui/Display.java 2023-03-04 01:43:03 UTC (rev 2719)
@@ -97,6 +97,7 @@
public void setController(AppController appController) {
this.appController = appController;
+ // if we ALREADY have a canvas, e.g. we created it in the midlet constrctor
if (current instanceof Canvas) {
current.initDisplayable(appController);
}
@@ -112,11 +113,13 @@
// Hide Keyboard, any time a new Displayable is set
if (!(newCurrent instanceof TextBox) && current instanceof Canvas) {
- ((Canvas) current).canvasView.closeTextEntry();
+ ((Canvas) current).getView().closeTextEntry();
}
if (newCurrent != current) {
+ // if we call setCurrent early (midlet constructor) and the controller is not set yet
+ // but its ok, when we set the controller in setController we will call initDisplayable
if (appController != null) {
newCurrent.initDisplayable(appController);
}
Modified: iOSME/src/javax/microedition/lcdui/Screen.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Screen.java 2023-03-02 18:38:01 UTC (rev 2718)
+++ iOSME/src/javax/microedition/lcdui/Screen.java 2023-03-04 01:43:03 UTC (rev 2719)
@@ -1,8 +1,5 @@
package javax.microedition.lcdui;
+public abstract class Screen extends Displayable {
-public abstract class Screen extends Displayable
-{
-
-
}
Modified: iOSME/src/javax/microedition/lcdui/TextBox.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/TextBox.java 2023-03-02 18:38:01 UTC (rev 2718)
+++ iOSME/src/javax/microedition/lcdui/TextBox.java 2023-03-04 01:43:03 UTC (rev 2719)
@@ -39,12 +39,12 @@
* @see net.yura.ios.NativeTextEntry
*/
@Override
- public void initDisplayable(AppController midlet) {
-
- Display display = Display.getDisplay(MIDlet.DEFAULT_MIDLET);
- CanvasView canvas = ((Canvas) display.getCurrent()).canvasView;
-
- canvas.openTextEntry();
+ public void initDisplayable(AppController controller) {
+ Displayable displayable = Display.getDisplay(MIDlet.DEFAULT_MIDLET).getCurrent();
+ if (displayable instanceof Canvas) {
+ CanvasView canvas = ((Canvas) displayable).getView();
+ canvas.openTextEntry();
+ }
}
public int getMaxSize() {
Modified: iOSME/src/net/yura/ios/AppController.java
===================================================================
--- iOSME/src/net/yura/ios/AppController.java 2023-03-02 18:38:01 UTC (rev 2718)
+++ iOSME/src/net/yura/ios/AppController.java 2023-03-04 01:43:03 UTC (rev 2719)
@@ -34,9 +34,13 @@
super(peer);
}
+ /**
+ * this method can be called at a random time, it should not rely on anything
+ * it should just set up the views it needs (midlet may be null)
+ */
@Override
- public void viewDidLoad() {
- super.viewDidLoad();
+ public void loadView() {
+ super.loadView();
NSNotificationCenter notificationCenter = NSNotificationCenter.defaultCenter();
notificationCenter.addObserverSelectorNameObject(this, new SEL("keyboardWillShow:"), UIKit.UIKeyboardWillShowNotification(), null);
@@ -55,8 +59,6 @@
}
});
*/
- Display display = Display.getDisplay(MIDlet.DEFAULT_MIDLET);
- display.setController(this);
}
@Selector("keyboardWillShow:")
@@ -100,8 +102,16 @@
/**
* @see CanvasView
*/
- public void setRendererView(UIView renderer) {
- this.renderer = renderer;
+ public void setRendererView(UIView canvasView) {
+ if (this.renderer == canvasView) {
+ return;
+ }
+
+ if (this.renderer != null) {
+ this.renderer.removeFromSuperview();
+ }
+
+ this.renderer = canvasView;
view().addSubview(renderer);
renderer.setTranslatesAutoresizingMaskIntoConstraints(false);
@@ -147,6 +157,10 @@
navigationController().setNavigationBarHidden(true);
Display display = Display.getDisplay(MIDlet.DEFAULT_MIDLET);
+
+ // only now do we know for SURE that we have BOTH the renderer AND the midlet
+ display.setController(this);
+
Displayable displayable = display.getCurrent();
if (displayable instanceof Canvas) {
((Canvas)displayable).fireShowNotify();
Modified: iOSME/src/net/yura/ios/CanvasView.java
===================================================================
--- iOSME/src/net/yura/ios/CanvasView.java 2023-03-02 18:38:01 UTC (rev 2718)
+++ iOSME/src/net/yura/ios/CanvasView.java 2023-03-04 01:43:03 UTC (rev 2719)
@@ -59,6 +59,7 @@
UIColor.orangeColor().set();
CGPoint cgPoint = new CGPoint(100, 100);
UIBezierPath.bezierPathWithArcCenterRadiusStartAngleEndAngleClockwise(cgPoint, 10, 0, 2 * Math.PI, true).fill();
+ return;
}
CGRect bounds = bounds();
Modified: iOSME/src/net/yura/ios/SwingMEiOSApplication.java
===================================================================
--- iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2023-03-02 18:38:01 UTC (rev 2718)
+++ iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2023-03-04 01:43:03 UTC (rev 2719)
@@ -75,6 +75,7 @@
iOSNotifications.init();
NativeTextEntry.init();
+ //ScrollToTopGestureRecognizer.init(vc);
NSBundle mainBundle = NSBundle.mainBundle();
String mainClass = (String)mainBundle.objectForInfoDictionaryKey("SwingME.Main.Class");
@@ -83,7 +84,7 @@
}
startSwingMEApp(mainClass); // swingme canvas (DesktopPane) is created and set when the main class is instantiated
- window.makeKeyAndVisible(); // this will call AppController.viewDidLoad
+ window.makeKeyAndVisible(); // this may call AppController.viewDidLoad
return true;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2023-03-02 18:38:03
|
Revision: 2718
http://sourceforge.net/p/swingme/code/2718
Author: yuranet
Date: 2023-03-02 18:38:01 +0000 (Thu, 02 Mar 2023)
Log Message:
-----------
color blind mode for android
Modified Paths:
--------------
AndroidME/src_Android/net/yura/android/AndroidMeApp.java
AndroidME/src_SwingME_plaf/net/yura/android/LoadingDialog.java
Modified: AndroidME/src_Android/net/yura/android/AndroidMeApp.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeApp.java 2023-03-02 15:45:41 UTC (rev 2717)
+++ AndroidME/src_Android/net/yura/android/AndroidMeApp.java 2023-03-02 18:38:01 UTC (rev 2718)
@@ -16,6 +16,7 @@
import android.os.Environment;
import android.os.Handler;
import android.os.Looper;
+import android.provider.Settings;
import android.telephony.TelephonyManager;
import android.util.DisplayMetrics;
import android.webkit.WebView;
@@ -337,6 +338,15 @@
ex.printStackTrace();
}
+ int daltonizerEnabled = 0;
+ try {
+ daltonizerEnabled = Settings.Secure.getInt(this.getContentResolver(), "accessibility_display_daltonizer_enabled");
+ }
+ catch (Throwable e) { }
+ if (daltonizerEnabled != 0) {
+ System.setProperty("shouldDifferentiateWithoutColor", "true");
+ }
+
// we HAVE to call any static method first to make sure the static initializer in Application sets the default
net.yura.mobile.gui.Application.getPlatform();
Logger.setLevel(net.yura.mobile.BuildConfig.DEBUG ? Logger.DEBUG : Logger.INFO);
Modified: AndroidME/src_SwingME_plaf/net/yura/android/LoadingDialog.java
===================================================================
--- AndroidME/src_SwingME_plaf/net/yura/android/LoadingDialog.java 2023-03-02 15:45:41 UTC (rev 2717)
+++ AndroidME/src_SwingME_plaf/net/yura/android/LoadingDialog.java 2023-03-02 18:38:01 UTC (rev 2718)
@@ -87,6 +87,7 @@
}
else if ("show".equals(action)) {
if (dialog!=null) {
+ // TODO this can cause out of memory errors
dialog.show();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2023-03-02 15:45:44
|
Revision: 2717
http://sourceforge.net/p/swingme/code/2717
Author: yuranet
Date: 2023-03-02 15:45:41 +0000 (Thu, 02 Mar 2023)
Log Message:
-----------
logging fix
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/components/List.java
Modified: SwingME/src/net/yura/mobile/gui/components/List.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/List.java 2023-03-02 02:09:33 UTC (rev 2716)
+++ SwingME/src/net/yura/mobile/gui/components/List.java 2023-03-02 15:45:41 UTC (rev 2717)
@@ -862,7 +862,7 @@
// as we use ensureIndexIsVisible to make the current item visible, we do not need makeVisible
// TODO, as components can have components inside them that have focus themselves, maybe they should handle the makeVisible themselves
//#debug debug
- System.out.println("skip makeVisible");
+ Logger.debug("[List] skipping makeVisible");
}
private int ensureIndexIsVisible=-1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2023-03-02 02:09:36
|
Revision: 2716
http://sourceforge.net/p/swingme/code/2716
Author: yuranet
Date: 2023-03-02 02:09:33 +0000 (Thu, 02 Mar 2023)
Log Message:
-----------
set default in more expected place
Modified Paths:
--------------
AndroidME/src_Android/net/yura/android/AndroidMeApp.java
iOSME/src/net/yura/ios/SwingMEiOSApplication.java
Modified: AndroidME/src_Android/net/yura/android/AndroidMeApp.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeApp.java 2023-03-02 00:07:19 UTC (rev 2715)
+++ AndroidME/src_Android/net/yura/android/AndroidMeApp.java 2023-03-02 02:09:33 UTC (rev 2716)
@@ -56,9 +56,6 @@
try {
Class<?> midletClass = Class.forName(className);
instance.midlet = (MIDlet) midletClass.newInstance();
-
- // set this after creating the SwingME Application, as static initializer in Application set it to default
- Logger.setLevel(net.yura.mobile.BuildConfig.DEBUG ? Logger.DEBUG : Logger.INFO);
} catch (Exception ex) {
throw new RuntimeException("unable to start MIDlet: "
+ className, ex);
@@ -339,6 +336,10 @@
catch (Exception ex) {
ex.printStackTrace();
}
+
+ // we HAVE to call any static method first to make sure the static initializer in Application sets the default
+ net.yura.mobile.gui.Application.getPlatform();
+ Logger.setLevel(net.yura.mobile.BuildConfig.DEBUG ? Logger.DEBUG : Logger.INFO);
}
private boolean hasPermission(String permission) {
Modified: iOSME/src/net/yura/ios/SwingMEiOSApplication.java
===================================================================
--- iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2023-03-02 00:07:19 UTC (rev 2715)
+++ iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2023-03-02 02:09:33 UTC (rev 2716)
@@ -166,6 +166,10 @@
// workaround for bug: https://github.com/multi-os-engine/multi-os-engine/issues/82
// this can be removed when we switch to MOE 1.9
Locale.setDefault(iOSUtil.toLocale(NSLocale.currentLocale()));
+
+ // we HAVE to call any static method first to make sure the static initializer in Application sets the default
+ net.yura.mobile.gui.Application.getPlatform();
+ Logger.setLevel("true".equals(System.getProperty("debug")) ? Logger.DEBUG : Logger.INFO);
}
private static boolean isiOSAppOnMac() {
@@ -196,9 +200,6 @@
MIDlet midlet = (MIDlet)myClass.newInstance();
- // set this after creating the SwingME Application, as static initializer in Application set it to default
- Logger.setLevel("true".equals(System.getProperty("debug")) ? Logger.DEBUG : Logger.INFO);
-
midlet.doStartApp();
}
catch (Exception ex) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2023-03-02 00:07:25
|
Revision: 2715
http://sourceforge.net/p/swingme/code/2715
Author: yuranet
Date: 2023-03-02 00:07:19 +0000 (Thu, 02 Mar 2023)
Log Message:
-----------
set log level correctly
Modified Paths:
--------------
AndroidME/src_Android/net/yura/android/AndroidMeApp.java
iOSME/src/net/yura/ios/SwingMEiOSApplication.java
Modified: AndroidME/src_Android/net/yura/android/AndroidMeApp.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeApp.java 2023-03-01 23:20:06 UTC (rev 2714)
+++ AndroidME/src_Android/net/yura/android/AndroidMeApp.java 2023-03-02 00:07:19 UTC (rev 2715)
@@ -56,6 +56,9 @@
try {
Class<?> midletClass = Class.forName(className);
instance.midlet = (MIDlet) midletClass.newInstance();
+
+ // set this after creating the SwingME Application, as static initializer in Application set it to default
+ Logger.setLevel(net.yura.mobile.BuildConfig.DEBUG ? Logger.DEBUG : Logger.INFO);
} catch (Exception ex) {
throw new RuntimeException("unable to start MIDlet: "
+ className, ex);
@@ -319,8 +322,8 @@
}
System.setProperty("debug", String.valueOf(net.yura.mobile.BuildConfig.DEBUG) );
- Logger.setLevel(net.yura.mobile.BuildConfig.DEBUG ? Logger.DEBUG : Logger.INFO);
+
// HTTP connection reuse which was buggy pre-froyo
// http://android-developers.blogspot.dk/2011/09/androids-http-clients.html
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB ) {
Modified: iOSME/src/net/yura/ios/SwingMEiOSApplication.java
===================================================================
--- iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2023-03-01 23:20:06 UTC (rev 2714)
+++ iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2023-03-02 00:07:19 UTC (rev 2715)
@@ -1,5 +1,6 @@
package net.yura.ios;
+import net.yura.mobile.logging.Logger;
import org.moe.GCUtil;
import org.moe.natj.general.Pointer;
import org.moe.natj.general.ann.RegisterOnStartup;
@@ -195,6 +196,9 @@
MIDlet midlet = (MIDlet)myClass.newInstance();
+ // set this after creating the SwingME Application, as static initializer in Application set it to default
+ Logger.setLevel("true".equals(System.getProperty("debug")) ? Logger.DEBUG : Logger.INFO);
+
midlet.doStartApp();
}
catch (Exception ex) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2023-03-01 23:20:09
|
Revision: 2714
http://sourceforge.net/p/swingme/code/2714
Author: yuranet
Date: 2023-03-01 23:20:06 +0000 (Wed, 01 Mar 2023)
Log Message:
-----------
set correct default logging level
Modified Paths:
--------------
AndroidME/src_Android/net/yura/android/AndroidMeActivity.java
AndroidME/src_Android/net/yura/android/AndroidMeApp.java
Modified: AndroidME/src_Android/net/yura/android/AndroidMeActivity.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeActivity.java 2023-03-01 22:54:15 UTC (rev 2713)
+++ AndroidME/src_Android/net/yura/android/AndroidMeActivity.java 2023-03-01 23:20:06 UTC (rev 2714)
@@ -130,7 +130,7 @@
window.setFormat(PixelFormat.RGBA_8888);
}
- Logger.debug("[AndroidMeActivity] onResume");
+ Logger.info("[AndroidMeActivity] onResume");
foreground = true;
if (wl!=null) {
@@ -142,7 +142,7 @@
protected void onPause() {
super.onPause();
- Logger.debug("[AndroidMeActivity] onPause");
+ Logger.info("[AndroidMeActivity] onPause");
foreground = false;
if (wl!=null) {
@@ -300,7 +300,7 @@
protected void onDestroy() {
super.onDestroy();
- Logger.debug("[AndroidMeActivity] onDestroy");
+ Logger.info("[AndroidMeActivity] onDestroy");
if (DEFAULT_ACTIVITY == this) {
// closeMIDlet();
Modified: AndroidME/src_Android/net/yura/android/AndroidMeApp.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeApp.java 2023-03-01 22:54:15 UTC (rev 2713)
+++ AndroidME/src_Android/net/yura/android/AndroidMeApp.java 2023-03-01 23:20:06 UTC (rev 2714)
@@ -319,8 +319,8 @@
}
System.setProperty("debug", String.valueOf(net.yura.mobile.BuildConfig.DEBUG) );
+ Logger.setLevel(net.yura.mobile.BuildConfig.DEBUG ? Logger.DEBUG : Logger.INFO);
-
// HTTP connection reuse which was buggy pre-froyo
// http://android-developers.blogspot.dk/2011/09/androids-http-clients.html
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB ) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2023-03-01 22:54:18
|
Revision: 2713
http://sourceforge.net/p/swingme/code/2713
Author: yuranet
Date: 2023-03-01 22:54:15 +0000 (Wed, 01 Mar 2023)
Log Message:
-----------
onDestroy logging
Modified Paths:
--------------
AndroidME/src_Android/net/yura/android/AndroidMeActivity.java
Modified: AndroidME/src_Android/net/yura/android/AndroidMeActivity.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeActivity.java 2023-03-01 22:52:48 UTC (rev 2712)
+++ AndroidME/src_Android/net/yura/android/AndroidMeActivity.java 2023-03-01 22:54:15 UTC (rev 2713)
@@ -300,6 +300,8 @@
protected void onDestroy() {
super.onDestroy();
+ Logger.debug("[AndroidMeActivity] onDestroy");
+
if (DEFAULT_ACTIVITY == this) {
// closeMIDlet();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2023-03-01 22:52:50
|
Revision: 2712
http://sourceforge.net/p/swingme/code/2712
Author: yuranet
Date: 2023-03-01 22:52:48 +0000 (Wed, 01 Mar 2023)
Log Message:
-----------
getLevel method added to logger
Modified Paths:
--------------
UtilME/src/net/yura/mobile/logging/Logger.java
Modified: UtilME/src/net/yura/mobile/logging/Logger.java
===================================================================
--- UtilME/src/net/yura/mobile/logging/Logger.java 2023-02-22 16:21:58 UTC (rev 2711)
+++ UtilME/src/net/yura/mobile/logging/Logger.java 2023-03-01 22:52:48 UTC (rev 2712)
@@ -50,17 +50,25 @@
level = DEBUG;
}
- public static void setLogger(Logger logger)
- {
+ public static void setLogger(Logger logger) {
Logger.logger = logger;
}
- public static void setLevel(int level)
- {
+ /**
+ * @see java.util.logging.Logger#setLevel(java.util.logging.Level)
+ */
+ public static void setLevel(int level) {
Logger.level = level;
}
/**
+ * @see java.util.logging.Logger#getLevel()
+ */
+ public static int getLevel() {
+ return level;
+ }
+
+ /**
* Debug logging is the most verbose and can be used for any type of logging.
* Developers will only need to see this info when debugging a problem and
* should work at the info level most of the time to avoid all the output.
@@ -179,14 +187,12 @@
return "[" + LEVEL_NAMES[level] + "] ";
}
- protected synchronized void log(String message, int level)
- {
+ protected synchronized void log(String message, int level) {
PrintStream out = level<WARN ? System.out : System.err;
out.println(toString(level) + message);
}
- protected synchronized void log(String error, Throwable throwable, int level)
- {
+ protected synchronized void log(String error, Throwable throwable, int level) {
System.err.println(toString(level) + (error == null ? "" : " " + error) + " " + throwable);
throwable.printStackTrace();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2023-02-22 16:22:02
|
Revision: 2711
http://sourceforge.net/p/swingme/code/2711
Author: yuranet
Date: 2023-02-22 16:21:58 +0000 (Wed, 22 Feb 2023)
Log Message:
-----------
more relaxed html loading
Modified Paths:
--------------
SwingME/lib/UtilME.jar
SwingME/src/net/yura/mobile/gui/layout/XHTMLLoader.java
Modified: SwingME/lib/UtilME.jar
===================================================================
(Binary files differ)
Modified: SwingME/src/net/yura/mobile/gui/layout/XHTMLLoader.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/layout/XHTMLLoader.java 2023-02-22 16:14:28 UTC (rev 2710)
+++ SwingME/src/net/yura/mobile/gui/layout/XHTMLLoader.java 2023-02-22 16:21:58 UTC (rev 2711)
@@ -64,6 +64,7 @@
KXmlParser parser = new KXmlParser();
parser.setInput(resultsStream, null);
+ parser.setFeature("http://xmlpull.org/v1/doc/features.html#relaxed", true);
startInlineSection();
@@ -583,7 +584,7 @@
}
//#mdebug info
else {
- Logger.info("strange place for th/td tag, th/td can not go here");
+ Logger.info("strange place for th/td tag, th/td can not go here " + this);
}
//#enddebug
@@ -871,5 +872,11 @@
private void setParant(TagHandler currentTag) {
parent = currentTag;
}
+
+ //#mdebug debug
+ public String toString() {
+ return "TagHandler{name=" + name + ", parent=" + parent + '}';
+ }
+ //#enddebug
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
