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...> - 2021-10-22 16:11:04
|
Revision: 2560
http://sourceforge.net/p/swingme/code/2560
Author: yuranet
Date: 2021-10-22 16:11:02 +0000 (Fri, 22 Oct 2021)
Log Message:
-----------
display scale System Property
Modified Paths:
--------------
iOSME/src/net/yura/ios/SwingMEiOSApplication.java
Modified: iOSME/src/net/yura/ios/SwingMEiOSApplication.java
===================================================================
--- iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2021-10-22 15:11:46 UTC (rev 2559)
+++ iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2021-10-22 16:11:02 UTC (rev 2560)
@@ -127,6 +127,8 @@
System.setProperty("debug", "true");
}
+ System.setProperty("display.scale", String.valueOf(UIScreen.mainScreen().scale()));
+
System.out.println("Running app from " + mainBundle.resourcePath());
System.out.println("App data folder " + System.getProperty("user.home"));
System.out.println("App temp folder " + System.getProperty("java.io.tmpdir"));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-10-22 15:11:47
|
Revision: 2559
http://sourceforge.net/p/swingme/code/2559
Author: yuranet
Date: 2021-10-22 15:11:46 +0000 (Fri, 22 Oct 2021)
Log Message:
-----------
can open resources from root in web view
Modified Paths:
--------------
iOSME/src/net/yura/ios/WebViewControllear.java
Modified: iOSME/src/net/yura/ios/WebViewControllear.java
===================================================================
--- iOSME/src/net/yura/ios/WebViewControllear.java 2021-07-30 00:28:57 UTC (rev 2558)
+++ iOSME/src/net/yura/ios/WebViewControllear.java 2021-10-22 15:11:46 UTC (rev 2559)
@@ -56,11 +56,22 @@
int slash = url.lastIndexOf('/');
String ext = url.substring(dot + 1);
String name = url.substring(slash + 1, dot);
- String path = url.substring(PROTOCOL_ASSET.length(), slash);
NSBundle mainBundle = NSBundle.mainBundle();
+ NSURL htmlFileUrl;
- NSURL htmlFileUrl = mainBundle.URLForResourceWithExtensionSubdirectory(name, ext, path);
+ if (slash > PROTOCOL_ASSET.length()) {
+ String path = url.substring(PROTOCOL_ASSET.length(), slash);
+ htmlFileUrl = mainBundle.URLForResourceWithExtensionSubdirectory(name, ext, path);
+ }
+ else {
+ htmlFileUrl = mainBundle.URLForResourceWithExtension(name, ext);
+ }
+
+ if (htmlFileUrl == null) {
+ throw new IllegalArgumentException("can not find resource for " + url);
+ }
+
myWebView.loadFileURLAllowingReadAccessToURL(htmlFileUrl, mainBundle.resourceURL());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-30 00:28:59
|
Revision: 2558
http://sourceforge.net/p/swingme/code/2558
Author: yuranet
Date: 2021-07-30 00:28:57 +0000 (Fri, 30 Jul 2021)
Log Message:
-----------
do not leak CIImage
Modified Paths:
--------------
iOSME/src/javax/microedition/lcdui/Graphics.java
Modified: iOSME/src/javax/microedition/lcdui/Graphics.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Graphics.java 2021-07-29 18:19:03 UTC (rev 2557)
+++ iOSME/src/javax/microedition/lcdui/Graphics.java 2021-07-30 00:28:57 UTC (rev 2558)
@@ -422,8 +422,8 @@
CIContext c = CIContext.contextWithCGContextOptions(context, null);
c.drawImageInRectFromRect(output, inRect, output.extent());
- // TODO remove the image from the filter, this does not work
- //filter.setNilValueForKey(CoreImage.kCIInputImageKey());
+ // for strange reason filter.setNilValueForKey(CoreImage.kCIInputImageKey()); does not work, but this does
+ filter.setValueForKey(null, CoreImage.kCIInputImageKey());
}
public void drawInRect(UIImage uiImageToDraw, int x, int y, int width, int height, CGAffineTransform affineTransform) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-29 18:19:06
|
Revision: 2557
http://sourceforge.net/p/swingme/code/2557
Author: yuranet
Date: 2021-07-29 18:19:03 +0000 (Thu, 29 Jul 2021)
Log Message:
-----------
use correct constant according to apple doc and new image draw api
Modified Paths:
--------------
iOSME/src/javax/microedition/lcdui/Image.java
Modified: iOSME/src/javax/microedition/lcdui/Image.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Image.java 2021-07-29 17:39:32 UTC (rev 2556)
+++ iOSME/src/javax/microedition/lcdui/Image.java 2021-07-29 18:19:03 UTC (rev 2557)
@@ -10,8 +10,8 @@
import org.moe.natj.general.ptr.IntPtr;
import org.moe.natj.general.ptr.impl.PtrFactory;
import apple.corefoundation.c.CoreFoundation;
+import apple.coregraphics.enums.CGBitmapInfo;
import apple.coregraphics.enums.CGImageAlphaInfo;
-import apple.coregraphics.enums.CGImageByteOrderInfo;
import apple.coregraphics.enums.CGInterpolationQuality;
import apple.coregraphics.opaque.CGColorSpaceRef;
import apple.coregraphics.opaque.CGContextRef;
@@ -20,6 +20,9 @@
import apple.coregraphics.struct.CGRect;
import apple.coregraphics.struct.CGSize;
import apple.foundation.NSData;
+import apple.uikit.UIGraphicsImageRenderer;
+import apple.uikit.UIGraphicsImageRendererContext;
+import apple.uikit.UIGraphicsImageRendererFormat;
import apple.uikit.UIImage;
import apple.uikit.c.UIKit;
import apple.coregraphics.c.CoreGraphics;
@@ -109,25 +112,37 @@
return image;
}
- private static UIImage grow9patch(UIImage img) {
+ private static UIImage grow9patch(final UIImage img) {
double scale = img.scale();
double extraPointsNeeded = 1.0 / scale;
- 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);
+ // 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;
- img = UIKit.UIGraphicsGetImageFromCurrentImageContext();
- UIKit.UIGraphicsEndImageContext();
- return img;
+ // 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);
+ }
+ });
}
private static void drawRegion(UIImage img, double xSrc, double ySrc, double width, double height, double xDst, double yDst) {
@@ -194,7 +209,7 @@
// we try and create a Context as close as we can to using UIKit.UIGraphicsBeginImageContext(new CGSize(width, height));
CGColorSpaceRef space = CoreGraphics.CGColorSpaceCreateDeviceRGB();
// min bytesPerRow is "width * (CoreGraphics.CGColorSpaceGetNumberOfComponents(space) + 1)" passing a value of 0 causes the value to be calculated automatically
- CGContextRef context = CoreGraphics.CGBitmapContextCreate(null, width, height, 8, 0, space, CGImageByteOrderInfo.Order32Little | CGImageAlphaInfo.PremultipliedFirst);
+ CGContextRef context = CoreGraphics.CGBitmapContextCreate(null, width, height, 8, 0, space, CGBitmapInfo.ByteOrder32Little | CGImageAlphaInfo.PremultipliedFirst);
CoreGraphics.CGColorSpaceRelease(space);
CoreGraphics.CGContextTranslateCTM(context, 0, height);
CoreGraphics.CGContextScaleCTM(context, 1.0, -1.0);
@@ -296,7 +311,7 @@
transformed = UIImage.imageWithCGImageScaleOrientation(cropped, scale, Graphics.getUIImageOrientation(transform));
}
- CoreGraphics.CGImageRelease(cropped); // TODO not sure if needed as we neveer called Retain
+ CoreGraphics.CGImageRelease(cropped);
if (transformed.scale() != scale || (transformed.size().width() != width && transformed.size().width() != height)) {
throw new IllegalStateException("scale is not correct " + transformed.scale() +"="+ start.scale() +" "+ transformed.size().width() +"="+ width +" "+ transformed.size().height() +"="+ height);
@@ -311,7 +326,6 @@
}
private void releaseCGContext() {
-
CGContextRef current = UIKit.UIGraphicsGetCurrentContext();
if (current == null || !current.getPeer().equals(context.getPeer())) {
UIKit.UIGraphicsPushContext(context);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-29 17:39:39
|
Revision: 2556
http://sourceforge.net/p/swingme/code/2556
Author: yuranet
Date: 2021-07-29 17:39:32 +0000 (Thu, 29 Jul 2021)
Log Message:
-----------
retain is gone again
Modified Paths:
--------------
iOSME/src/javax/microedition/lcdui/Image.java
Modified: iOSME/src/javax/microedition/lcdui/Image.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Image.java 2021-07-29 16:08:43 UTC (rev 2555)
+++ iOSME/src/javax/microedition/lcdui/Image.java 2021-07-29 17:39:32 UTC (rev 2556)
@@ -10,7 +10,10 @@
import org.moe.natj.general.ptr.IntPtr;
import org.moe.natj.general.ptr.impl.PtrFactory;
import apple.corefoundation.c.CoreFoundation;
+import apple.coregraphics.enums.CGImageAlphaInfo;
+import apple.coregraphics.enums.CGImageByteOrderInfo;
import apple.coregraphics.enums.CGInterpolationQuality;
+import apple.coregraphics.opaque.CGColorSpaceRef;
import apple.coregraphics.opaque.CGContextRef;
import apple.coregraphics.opaque.CGImageRef;
import apple.coregraphics.struct.CGPoint;
@@ -48,11 +51,6 @@
throw new NullPointerException();
}
this.context = context;
-
- // this is almost never needed, but if this context is created on a background thread
- // and that thread finishes, then the context is released, even if we still hold it here.
- // background loading threads are used in the SwingME FileChooser
- CoreGraphics.CGContextRetain(context);
}
public static Image createImage(String resource) throws IOException {
@@ -184,9 +182,25 @@
}
public static Image createImage(int width, int height) {
- UIKit.UIGraphicsBeginImageContext(new CGSize(width, height));
- CGContextRef context = UIKit.UIGraphicsGetCurrentContext();
+ // this works fine in ALMOST all situations, but sadly not in all
+ // this creates a Context thats tied to the current thread, if the thread finishes, the context is gone?!?!
+ // if we add an extra retain, we will not know how many times to release it, as that depends on if the thread that created it is still alive
+ // and we do not want to keep track of the thread that created the context in here
+ // another option would be to thread-switch all new context creation to the main thread
+ // background loading threads are used in the SwingME FileChooser
+ //UIKit.UIGraphicsBeginImageContext(new CGSize(width, height));
+ //CGContextRef context = UIKit.UIGraphicsGetCurrentContext();
+ // we try and create a Context as close as we can to using UIKit.UIGraphicsBeginImageContext(new CGSize(width, height));
+ CGColorSpaceRef space = CoreGraphics.CGColorSpaceCreateDeviceRGB();
+ // min bytesPerRow is "width * (CoreGraphics.CGColorSpaceGetNumberOfComponents(space) + 1)" passing a value of 0 causes the value to be calculated automatically
+ CGContextRef context = CoreGraphics.CGBitmapContextCreate(null, width, height, 8, 0, space, CGImageByteOrderInfo.Order32Little | CGImageAlphaInfo.PremultipliedFirst);
+ CoreGraphics.CGColorSpaceRelease(space);
+ CoreGraphics.CGContextTranslateCTM(context, 0, height);
+ CoreGraphics.CGContextScaleCTM(context, 1.0, -1.0);
+
+ //System.out.println("BitmapContext2 BitsPerPixel=" +CoreGraphics.CGBitmapContextGetBitsPerPixel(context) + " BitsPerComponent=" +CoreGraphics.CGBitmapContextGetBitsPerComponent(context) + " BytesPerRow=" +CoreGraphics.CGBitmapContextGetBytesPerRow(context) + " AlphaInfo=" +CoreGraphics.CGBitmapContextGetAlphaInfo(context) + " BitmapInfo=" +CoreGraphics.CGBitmapContextGetBitmapInfo(context));
+
// MIDP: All pixels should be white
Graphics g = new Graphics(context);
g.setColor(0xFFFFFFFF);
@@ -297,12 +311,6 @@
}
private void releaseCGContext() {
- if (mutable) {
- // we hold an extra retain for mutable images in case they are created in a background thread,
- // as iOS releases all context that belong to a backgound thread if that thread finishes.
- // background loading threads are used in the SwingME FileChooser
- CoreGraphics.CGContextRelease(context);
- }
CGContextRef current = UIKit.UIGraphicsGetCurrentContext();
if (current == null || !current.getPeer().equals(context.getPeer())) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-29 16:08:46
|
Revision: 2555
http://sourceforge.net/p/swingme/code/2555
Author: yuranet
Date: 2021-07-29 16:08:43 +0000 (Thu, 29 Jul 2021)
Log Message:
-----------
Retain is back, but with better comments this time
Modified Paths:
--------------
iOSME/src/javax/microedition/lcdui/Image.java
Modified: iOSME/src/javax/microedition/lcdui/Image.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Image.java 2021-07-29 14:53:15 UTC (rev 2554)
+++ iOSME/src/javax/microedition/lcdui/Image.java 2021-07-29 16:08:43 UTC (rev 2555)
@@ -48,6 +48,11 @@
throw new NullPointerException();
}
this.context = context;
+
+ // this is almost never needed, but if this context is created on a background thread
+ // and that thread finishes, then the context is released, even if we still hold it here.
+ // background loading threads are used in the SwingME FileChooser
+ CoreGraphics.CGContextRetain(context);
}
public static Image createImage(String resource) throws IOException {
@@ -292,6 +297,13 @@
}
private void releaseCGContext() {
+ if (mutable) {
+ // we hold an extra retain for mutable images in case they are created in a background thread,
+ // as iOS releases all context that belong to a backgound thread if that thread finishes.
+ // background loading threads are used in the SwingME FileChooser
+ CoreGraphics.CGContextRelease(context);
+ }
+
CGContextRef current = UIKit.UIGraphicsGetCurrentContext();
if (current == null || !current.getPeer().equals(context.getPeer())) {
UIKit.UIGraphicsPushContext(context);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-29 14:53:18
|
Revision: 2554
http://sourceforge.net/p/swingme/code/2554
Author: yuranet
Date: 2021-07-29 14:53:15 +0000 (Thu, 29 Jul 2021)
Log Message:
-----------
got rid of CoreGraphics.CGContextRetain(context) that was not needed
Modified Paths:
--------------
iOSME/src/javax/microedition/lcdui/Image.java
Modified: iOSME/src/javax/microedition/lcdui/Image.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Image.java 2021-07-29 12:43:12 UTC (rev 2553)
+++ iOSME/src/javax/microedition/lcdui/Image.java 2021-07-29 14:53:15 UTC (rev 2554)
@@ -48,7 +48,6 @@
throw new NullPointerException();
}
this.context = context;
- CoreGraphics.CGContextRetain(context);
}
public static Image createImage(String resource) throws IOException {
@@ -198,24 +197,6 @@
return img;
}
- public void setRGB(int[] rgbData, int offset, int srcScanLength, int width, int height, boolean processAlpha) {
- Graphics g = getGraphics();
- int distScanLength = getIntsPerRow();
-
- IntPtr intPtr = CoreGraphics.CGBitmapContextGetData(g.getContext()).getIntPtr();
- for (int y = 0; y < height; y++) {
- if (processAlpha) {
- intPtr.copyFrom(rgbData, offset+ y * srcScanLength, y * distScanLength, width);
- }
- else {
- // TODO this could be better
- for (int x = 0; x < width; x++) {
- intPtr.setValue(y * distScanLength + x, rgbData[offset + y * srcScanLength + x] | 0xFF000000);
- }
- }
- }
- }
-
public boolean isMutable() {
//return uiImage == null || uiImage.scale() == 1.0;
return mutable;
@@ -311,7 +292,14 @@
}
private void releaseCGContext() {
- CoreGraphics.CGContextRelease(context);
+ CGContextRef current = UIKit.UIGraphicsGetCurrentContext();
+ if (current == null || !current.getPeer().equals(context.getPeer())) {
+ UIKit.UIGraphicsPushContext(context);
+
+ }
+ UIKit.UIGraphicsEndImageContext(); // this seems to do the same as CGContextRelease, maybe it does something more
+ // has the same effect on memory, and causes a crash if we call CGContextRelease after UIGraphicsEndImageContext
+ //CoreGraphics.CGContextRelease(context);
context = null;
}
@@ -362,7 +350,6 @@
// load the current image into the context
UIKit.UIGraphicsBeginImageContext(new CGSize(getWidth(), getHeight()));
context = UIKit.UIGraphicsGetCurrentContext();
- CoreGraphics.CGContextRetain(context);
// this is needed for 9-patches to load correctly
CoreGraphics.CGContextSetInterpolationQuality(context, CGInterpolationQuality.None);
@@ -381,6 +368,24 @@
}
}
+ public void setRGB(int[] rgbData, int offset, int srcScanLength, int width, int height, boolean processAlpha) {
+ Graphics g = getGraphics();
+ int distScanLength = getIntsPerRow();
+
+ IntPtr intPtr = CoreGraphics.CGBitmapContextGetData(g.getContext()).getIntPtr();
+ for (int y = 0; y < height; y++) {
+ if (processAlpha) {
+ intPtr.copyFrom(rgbData, offset+ y * srcScanLength, y * distScanLength, width);
+ }
+ else {
+ // TODO this could be better
+ for (int x = 0; x < width; x++) {
+ intPtr.setValue(y * distScanLength + x, rgbData[offset + y * srcScanLength + x] | 0xFF000000);
+ }
+ }
+ }
+ }
+
public void setRGB(int x, int y, int color) {
Graphics g = getGraphics();
int srcScanLenght = getIntsPerRow();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-29 12:43:17
|
Revision: 2553
http://sourceforge.net/p/swingme/code/2553
Author: yuranet
Date: 2021-07-29 12:43:12 +0000 (Thu, 29 Jul 2021)
Log Message:
-----------
remove pools as they are not actually helping
Modified Paths:
--------------
iOSME/src/android/graphics/ColorMatrix.java
iOSME/src/javax/microedition/lcdui/Graphics.java
iOSME/src/javax/microedition/lcdui/Image.java
Modified: iOSME/src/android/graphics/ColorMatrix.java
===================================================================
--- iOSME/src/android/graphics/ColorMatrix.java 2021-07-29 11:09:56 UTC (rev 2552)
+++ iOSME/src/android/graphics/ColorMatrix.java 2021-07-29 12:43:12 UTC (rev 2553)
@@ -1,6 +1,5 @@
package android.graphics;
-import org.moe.natj.objc.ObjCRuntime;
import java.util.Arrays;
import apple.coreimage.CIFilter;
import apple.coreimage.CIVector;
@@ -182,8 +181,6 @@
*/
public CIFilter toCIFilter() {
- long pool = ObjCRuntime.createAutoreleasePool();
-
CIFilter filter = CIFilter.filterWithName("CIColorMatrix");
CIVector rVector = CIVector.vectorWithXYZW(mArray[0], mArray[1], mArray[2], mArray[3]);
CIVector gVector = CIVector.vectorWithXYZW(mArray[5], mArray[6], mArray[7], mArray[8]);
@@ -197,9 +194,6 @@
filter.setValueForKey(aVector, "inputAVector");
filter.setValueForKey(inputBiasVector, "inputBiasVector");
- // clear all autorelease referances and only keep java ones
- ObjCRuntime.releaseAutoreleasePool(pool);
-
return filter;
}
}
Modified: iOSME/src/javax/microedition/lcdui/Graphics.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Graphics.java 2021-07-29 11:09:56 UTC (rev 2552)
+++ iOSME/src/javax/microedition/lcdui/Graphics.java 2021-07-29 12:43:12 UTC (rev 2553)
@@ -272,6 +272,7 @@
if (font == null) {
font = Font.getDefaultFont();
}
+ // TODO i think this is not being used, as we always set the font on the NSString object anyway
CoreGraphics.CGContextSetFont(context, ObjCRuntime.cast(font.font, CGFontRef.class));
this.font = font;
}
Modified: iOSME/src/javax/microedition/lcdui/Image.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Image.java 2021-07-29 11:09:56 UTC (rev 2552)
+++ iOSME/src/javax/microedition/lcdui/Image.java 2021-07-29 12:43:12 UTC (rev 2553)
@@ -9,7 +9,6 @@
import org.moe.natj.general.ptr.BytePtr;
import org.moe.natj.general.ptr.IntPtr;
import org.moe.natj.general.ptr.impl.PtrFactory;
-import org.moe.natj.objc.ObjCRuntime;
import apple.corefoundation.c.CoreFoundation;
import apple.coregraphics.enums.CGInterpolationQuality;
import apple.coregraphics.opaque.CGContextRef;
@@ -54,66 +53,58 @@
public static Image createImage(String resource) throws IOException {
- long pool = ObjCRuntime.createAutoreleasePool();
- try {
+ // try load any image that may be in a group
+ UIImage img = UIImage.imageNamed(resource.startsWith("/") ? resource.substring(1) : resource);
+ if (img != null) {
+ return new Image(img);
+ }
- // try load any image that may be in a group
- UIImage img = UIImage.imageNamed(resource.startsWith("/") ? resource.substring(1) : resource);
- if (img != null) {
- return new Image(img);
- }
+ // for images that are copied during build step, they are in a folder not a group, so we need to have a folder name
+ // https://stackoverflow.com/questions/11499925/uiimage-imagenamed-does-not-find-image-within-blue-referenced-xcode-folder
+ img = UIImage.imageNamed("Graphics" + resource);
- // for images that are copied during build step, they are in a folder not a group, so we need to have a folder name
- // https://stackoverflow.com/questions/11499925/uiimage-imagenamed-does-not-find-image-within-blue-referenced-xcode-folder
- img = UIImage.imageNamed("Graphics" + resource);
+ if (img != null) {
- if (img != null) {
+ if (img.size().width() % 1 != 0 || img.size().height() % 1 != 0) {
+ System.out.println("WARN strange image size " + resource + " " + UIKit.NSStringFromCGSize(img.size()));
+ }
- if (img.size().width() % 1 != 0 || img.size().height() % 1 != 0) {
- System.out.println("WARN strange image size " + resource + " " + UIKit.NSStringFromCGSize(img.size()));
- }
-
- if (resource.endsWith(".9.png") && img.scale() != 1.0) {
+ if (resource.endsWith(".9.png") && img.scale() != 1.0) {
+ img = grow9patch(img);
+ if (img.scale() == 3.0) {
img = grow9patch(img);
- if (img.scale() == 3.0) {
- img = grow9patch(img);
- }
}
-
- return new Image(img);
}
+ return new Image(img);
+ }
+
/* can do this with newer versions of java
- URL url = Image.class.getResource(resource);
- if (url != null) {
- try {
- Path path = Paths.get(url.toURI());
- byte[] bytes = Files.readAllBytes(path);
+ URL url = Image.class.getResource(resource);
+ if (url != null) {
+ try {
+ Path path = Paths.get(url.toURI());
+ byte[] bytes = Files.readAllBytes(path);
- // https://discuss.multi-os-engine.org/t/stream-to-nsdata-and-moe-pointer-magic/306
- BytePtr ptr = PtrFactory.newByteArray(bytes);
- NSData data = NSData.dataWithBytesLength( ptr, bytes.length );
- UIImage image = UIImage.imageWithData( data );
- return new Image(image);
- }
- catch (Exception ex) {
- throw new IOException(ex);
- }
+ // https://discuss.multi-os-engine.org/t/stream-to-nsdata-and-moe-pointer-magic/306
+ BytePtr ptr = PtrFactory.newByteArray(bytes);
+ NSData data = NSData.dataWithBytesLength( ptr, bytes.length );
+ UIImage image = UIImage.imageWithData( data );
+ return new Image(image);
}
+ catch (Exception ex) {
+ throw new IOException(ex);
+ }
+ }
*/
- InputStream in = Image.class.getResourceAsStream(resource);
- if (in == null) {
- throw new IOException("can not find: " + resource);
- }
- Image image = createImage(in);
- in.close();
- return image;
-
+ InputStream in = Image.class.getResourceAsStream(resource);
+ if (in == null) {
+ throw new IOException("can not find: " + resource);
}
- finally {
- ObjCRuntime.releaseAutoreleasePool(pool);
- }
+ Image image = createImage(in);
+ in.close();
+ return image;
}
private static UIImage grow9patch(UIImage img) {
@@ -163,27 +154,20 @@
public static Image createImage(byte[] imgData, int offset, int length) {
- long pool = ObjCRuntime.createAutoreleasePool();
- try {
-
- // https://discuss.multi-os-engine.org/t/stream-to-nsdata-and-moe-pointer-magic/306
- BytePtr ptr;
- if (offset == 0 && length == imgData.length) {
- ptr = PtrFactory.newByteArray(imgData);
- } else {
- ptr = PtrFactory.newByteArray(length);
- ptr.copyFrom(imgData, offset, 0, length);
- }
- NSData data = NSData.dataWithBytesLength(ptr, length);
- UIImage image = UIImage.imageWithData(data);
- if (image == null) {
- throw new IllegalArgumentException("failed to make image from " + imgData + " " + offset + " " + length);
- }
- return new Image(image);
+ // https://discuss.multi-os-engine.org/t/stream-to-nsdata-and-moe-pointer-magic/306
+ BytePtr ptr;
+ if (offset == 0 && length == imgData.length) {
+ ptr = PtrFactory.newByteArray(imgData);
+ } else {
+ ptr = PtrFactory.newByteArray(length);
+ ptr.copyFrom(imgData, offset, 0, length);
}
- finally {
- ObjCRuntime.releaseAutoreleasePool(pool);
+ NSData data = NSData.dataWithBytesLength(ptr, length);
+ UIImage image = UIImage.imageWithData(data);
+ if (image == null) {
+ throw new IllegalArgumentException("failed to make image from " + imgData + " " + offset + " " + length);
}
+ return new Image(image);
}
public static Image createImage(Image image, int x, int y, int width, int height, int transform) {
@@ -292,9 +276,7 @@
*/
CGImageRef cgImageRef = CoreGraphics.CGBitmapContextCreateImage(context);
- long pool = ObjCRuntime.createAutoreleasePool();
uiImage = UIImage.imageWithCGImage(cgImageRef);
- ObjCRuntime.releaseAutoreleasePool(pool);
CoreGraphics.CGImageRelease(cgImageRef);
return uiImage;
@@ -306,7 +288,6 @@
CGRect srcRect = new CGRect(new CGPoint(scale * xSrc, scale * ySrc), new CGSize(scale * width, scale * height));
CGImageRef cropped = CoreGraphics.CGImageCreateWithImageInRect(start.CGImage(), srcRect);
- long pool = ObjCRuntime.createAutoreleasePool();
UIImage transformed;
if (transform == Sprite.TRANS_NONE && scale == 1.0) {
transformed = UIImage.imageWithCGImage(cropped);
@@ -314,7 +295,6 @@
else {
transformed = UIImage.imageWithCGImageScaleOrientation(cropped, scale, Graphics.getUIImageOrientation(transform));
}
- ObjCRuntime.releaseAutoreleasePool(pool);
CoreGraphics.CGImageRelease(cropped); // TODO not sure if needed as we neveer called Retain
@@ -336,7 +316,7 @@
}
private void releaseUIImage() {
- // as we always created UIImages inside pools, only java holds the referances to the objects
+ // as we always created UIImages from java, only java holds the referances to the objects
// so when we release them in java (through GC), they will also get released in iOS
// https://www.noisyfox.io/natj-memory-management.html
uiImage = null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-29 11:09:58
|
Revision: 2552
http://sourceforge.net/p/swingme/code/2552
Author: yuranet
Date: 2021-07-29 11:09:56 +0000 (Thu, 29 Jul 2021)
Log Message:
-----------
set title works
Modified Paths:
--------------
iOSME/src/net/yura/ios/WebViewControllear.java
Modified: iOSME/src/net/yura/ios/WebViewControllear.java
===================================================================
--- iOSME/src/net/yura/ios/WebViewControllear.java 2021-07-29 10:52:09 UTC (rev 2551)
+++ iOSME/src/net/yura/ios/WebViewControllear.java 2021-07-29 11:09:56 UTC (rev 2552)
@@ -5,10 +5,12 @@
import apple.foundation.NSURL;
import apple.uikit.UIScreen;
import apple.uikit.UIViewController;
+import apple.webkit.WKNavigation;
import apple.webkit.WKWebView;
+import apple.webkit.protocol.WKNavigationDelegate;
import apple.webkit.protocol.WKUIDelegate;
-public class WebViewControllear extends UIViewController implements WKUIDelegate {
+public class WebViewControllear extends UIViewController implements WKUIDelegate, WKNavigationDelegate {
public static final String PROTOCOL_ASSET = "file:///android_asset/";
@@ -34,6 +36,7 @@
myWebView = WKWebView.alloc().initWithFrame(UIScreen.mainScreen().bounds());
myWebView.setUIDelegate(this);
+ myWebView.setNavigationDelegate(this);
view().addSubview(myWebView);
openURL(url);
@@ -66,4 +69,9 @@
//let indexFileUrl = documentDirUrl.appendingPathComponent("index.html")
//webView.loadFileURL(indexFileUrl, allowingReadAccessTo: documentDirUrl)
}
+
+ @Override
+ public void webViewDidFinishNavigation(WKWebView webView, WKNavigation navigation) {
+ setTitle(myWebView.title());
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-29 10:52:12
|
Revision: 2551
http://sourceforge.net/p/swingme/code/2551
Author: yuranet
Date: 2021-07-29 10:52:09 +0000 (Thu, 29 Jul 2021)
Log Message:
-----------
open help file works, but still issues with size, scrolling and links
Modified Paths:
--------------
iOSME/src/javax/microedition/midlet/MIDlet.java
iOSME/src/net/yura/ios/AppController.java
iOSME/src/net/yura/ios/SwingMEiOSApplication.java
Added Paths:
-----------
iOSME/src/net/yura/ios/WebViewControllear.java
Modified: iOSME/src/javax/microedition/midlet/MIDlet.java
===================================================================
--- iOSME/src/javax/microedition/midlet/MIDlet.java 2021-07-28 21:49:27 UTC (rev 2550)
+++ iOSME/src/javax/microedition/midlet/MIDlet.java 2021-07-29 10:52:09 UTC (rev 2551)
@@ -1,5 +1,6 @@
package javax.microedition.midlet;
+import net.yura.ios.WebViewControllear;
import java.util.Properties;
import javax.microedition.io.ConnectionNotFoundException;
import javax.microedition.lcdui.Display;
@@ -9,6 +10,7 @@
import apple.foundation.NSURL;
import apple.foundation.NSURLComponents;
import apple.uikit.UIApplication;
+import apple.uikit.UINavigationController;
public abstract class MIDlet {
@@ -142,9 +144,14 @@
// eg (with the brackets and everything else past the = URL encoded): geo://lat,long?q=lat,long(description)
// TODO open map
}
- else if (url.startsWith("file:///android_asset/")) {
- throw new UnsupportedOperationException();
- // TODO open html page
+ else if (url.startsWith(WebViewControllear.PROTOCOL_ASSET)) {
+
+ WebViewControllear webViewControllear = WebViewControllear.alloc().init();
+ webViewControllear.setURL(url);
+
+ UINavigationController rootViewController = (UINavigationController) UIApplication.sharedApplication().keyWindow().rootViewController();
+ //presentViewControllerAnimatedCompletion
+ rootViewController.pushViewControllerAnimated(webViewControllear, true);
}
//else if (url.startsWith("mailto:") && containsQueryParameter(url, "attachment")) {
// throw new UnsupportedOperationException();
Modified: iOSME/src/net/yura/ios/AppController.java
===================================================================
--- iOSME/src/net/yura/ios/AppController.java 2021-07-28 21:49:27 UTC (rev 2550)
+++ iOSME/src/net/yura/ios/AppController.java 2021-07-29 10:52:09 UTC (rev 2551)
@@ -82,6 +82,8 @@
public void viewWillAppear(boolean animated) {
super.viewWillAppear(animated);
+ navigationController().setNavigationBarHidden(true);
+
Display display = Display.getDisplay(MIDlet.DEFAULT_MIDLET);
Displayable displayable = display.getCurrent();
if (displayable instanceof Canvas) {
@@ -100,4 +102,13 @@
super.viewDidDisappear(animated);
}
+
+ @Override
+ public void didReceiveMemoryWarning() {
+ super.didReceiveMemoryWarning();
+
+ System.gc();
+ Thread.yield();
+ System.gc();
+ }
}
Modified: iOSME/src/net/yura/ios/SwingMEiOSApplication.java
===================================================================
--- iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2021-07-28 21:49:27 UTC (rev 2550)
+++ iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2021-07-29 10:52:09 UTC (rev 2551)
@@ -1,5 +1,6 @@
package net.yura.ios;
+import org.moe.GCUtil;
import org.moe.natj.general.Pointer;
import org.moe.natj.general.ann.RegisterOnStartup;
import org.moe.natj.general.ptr.BytePtr;
@@ -69,9 +70,7 @@
public boolean applicationDidFinishLaunchingWithOptions(UIApplication application, NSDictionary launchOptions) {
UIViewController vc = AppController.alloc().init();
- // TODO do we need this? will this be used to open an internal browser?
UINavigationController navigationController = UINavigationController.alloc().init();
- navigationController.setNavigationBarHidden(true);
navigationController.initWithRootViewController(vc);
UIScreen screen = UIScreen.mainScreen();
@@ -78,6 +77,9 @@
window = UIWindow.alloc().initWithFrame(screen.bounds());
window.setRootViewController(navigationController);
+ // will force gc each time the app is put into background
+ GCUtil.register();
+
// setup and launch swingme app
setupSystemProperties();
NSBundle mainBundle = NSBundle.mainBundle();
Added: iOSME/src/net/yura/ios/WebViewControllear.java
===================================================================
--- iOSME/src/net/yura/ios/WebViewControllear.java (rev 0)
+++ iOSME/src/net/yura/ios/WebViewControllear.java 2021-07-29 10:52:09 UTC (rev 2551)
@@ -0,0 +1,69 @@
+package net.yura.ios;
+
+import org.moe.natj.general.Pointer;
+import apple.foundation.NSBundle;
+import apple.foundation.NSURL;
+import apple.uikit.UIScreen;
+import apple.uikit.UIViewController;
+import apple.webkit.WKWebView;
+import apple.webkit.protocol.WKUIDelegate;
+
+public class WebViewControllear extends UIViewController implements WKUIDelegate {
+
+ public static final String PROTOCOL_ASSET = "file:///android_asset/";
+
+ private WKWebView myWebView;
+ private String url;
+
+ public static native WebViewControllear alloc();
+
+ @Override
+ public native WebViewControllear init();
+
+ protected WebViewControllear(Pointer peer) {
+ super(peer);
+ }
+
+ public void setURL(String url) {
+ this.url = url;
+ }
+
+ @Override
+ public void viewDidLoad() {
+ super.viewDidLoad();
+
+ myWebView = WKWebView.alloc().initWithFrame(UIScreen.mainScreen().bounds());
+ myWebView.setUIDelegate(this);
+ view().addSubview(myWebView);
+
+ openURL(url);
+ }
+
+ @Override
+ public void viewWillAppear(boolean animated) {
+ super.viewWillAppear(animated);
+
+ navigationController().setNavigationBarHidden(false);
+ }
+
+ private void openURL(String url) {
+
+ if (url.startsWith(PROTOCOL_ASSET)) {
+ int dot = url.lastIndexOf('.');
+ int slash = url.lastIndexOf('/');
+ String ext = url.substring(dot + 1);
+ String name = url.substring(slash + 1, dot);
+ String path = url.substring(PROTOCOL_ASSET.length(), slash);
+
+ NSBundle mainBundle = NSBundle.mainBundle();
+
+ NSURL htmlFileUrl = mainBundle.URLForResourceWithExtensionSubdirectory(name, ext, path);
+ myWebView.loadFileURLAllowingReadAccessToURL(htmlFileUrl, mainBundle.resourceURL());
+ }
+
+
+ //let documentDirUrl = try! FileManager.default.url(for: .documentDirectory, in: .userDomainMask, appropriateFor: nil, create: false)
+ //let indexFileUrl = documentDirUrl.appendingPathComponent("index.html")
+ //webView.loadFileURL(indexFileUrl, allowingReadAccessTo: documentDirUrl)
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-28 21:49:30
|
Revision: 2550
http://sourceforge.net/p/swingme/code/2550
Author: yuranet
Date: 2021-07-28 21:49:27 +0000 (Wed, 28 Jul 2021)
Log Message:
-----------
autorelease all iOS refs
Modified Paths:
--------------
iOSME/src/android/graphics/ColorMatrix.java
iOSME/src/javax/microedition/lcdui/Image.java
Modified: iOSME/src/android/graphics/ColorMatrix.java
===================================================================
--- iOSME/src/android/graphics/ColorMatrix.java 2021-07-28 19:32:47 UTC (rev 2549)
+++ iOSME/src/android/graphics/ColorMatrix.java 2021-07-28 21:49:27 UTC (rev 2550)
@@ -1,5 +1,6 @@
package android.graphics;
+import org.moe.natj.objc.ObjCRuntime;
import java.util.Arrays;
import apple.coreimage.CIFilter;
import apple.coreimage.CIVector;
@@ -181,6 +182,8 @@
*/
public CIFilter toCIFilter() {
+ long pool = ObjCRuntime.createAutoreleasePool();
+
CIFilter filter = CIFilter.filterWithName("CIColorMatrix");
CIVector rVector = CIVector.vectorWithXYZW(mArray[0], mArray[1], mArray[2], mArray[3]);
CIVector gVector = CIVector.vectorWithXYZW(mArray[5], mArray[6], mArray[7], mArray[8]);
@@ -194,6 +197,9 @@
filter.setValueForKey(aVector, "inputAVector");
filter.setValueForKey(inputBiasVector, "inputBiasVector");
+ // clear all autorelease referances and only keep java ones
+ ObjCRuntime.releaseAutoreleasePool(pool);
+
return filter;
}
}
Modified: iOSME/src/javax/microedition/lcdui/Image.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Image.java 2021-07-28 19:32:47 UTC (rev 2549)
+++ iOSME/src/javax/microedition/lcdui/Image.java 2021-07-28 21:49:27 UTC (rev 2550)
@@ -54,58 +54,66 @@
public static Image createImage(String resource) throws IOException {
- // try load any image that may be in a group
- UIImage img = UIImage.imageNamed(resource.startsWith("/") ? resource.substring(1) : resource);
- if (img != null) {
- return new Image(img);
- }
+ long pool = ObjCRuntime.createAutoreleasePool();
+ try {
- // for images that are copied during build step, they are in a folder not a group, so we need to have a folder name
- // https://stackoverflow.com/questions/11499925/uiimage-imagenamed-does-not-find-image-within-blue-referenced-xcode-folder
- img = UIImage.imageNamed("Graphics" + resource);
+ // try load any image that may be in a group
+ UIImage img = UIImage.imageNamed(resource.startsWith("/") ? resource.substring(1) : resource);
+ if (img != null) {
+ return new Image(img);
+ }
- if (img != null) {
+ // for images that are copied during build step, they are in a folder not a group, so we need to have a folder name
+ // https://stackoverflow.com/questions/11499925/uiimage-imagenamed-does-not-find-image-within-blue-referenced-xcode-folder
+ img = UIImage.imageNamed("Graphics" + resource);
- if (img.size().width() % 1 != 0 || img.size().height() % 1 != 0) {
- System.out.println("WARN strange image size " + resource + " " + UIKit.NSStringFromCGSize(img.size()));
- }
+ if (img != null) {
- if (resource.endsWith(".9.png") && img.scale() != 1.0) {
- img = grow9patch(img);
- if (img.scale() == 3.0) {
+ if (img.size().width() % 1 != 0 || img.size().height() % 1 != 0) {
+ System.out.println("WARN strange image size " + resource + " " + UIKit.NSStringFromCGSize(img.size()));
+ }
+
+ if (resource.endsWith(".9.png") && img.scale() != 1.0) {
img = grow9patch(img);
+ if (img.scale() == 3.0) {
+ img = grow9patch(img);
+ }
}
+
+ return new Image(img);
}
- return new Image(img);
- }
-
/* can do this with newer versions of java
- URL url = Image.class.getResource(resource);
- if (url != null) {
- try {
- Path path = Paths.get(url.toURI());
- byte[] bytes = Files.readAllBytes(path);
+ URL url = Image.class.getResource(resource);
+ if (url != null) {
+ try {
+ Path path = Paths.get(url.toURI());
+ byte[] bytes = Files.readAllBytes(path);
- // https://discuss.multi-os-engine.org/t/stream-to-nsdata-and-moe-pointer-magic/306
- BytePtr ptr = PtrFactory.newByteArray(bytes);
- NSData data = NSData.dataWithBytesLength( ptr, bytes.length );
- UIImage image = UIImage.imageWithData( data );
- return new Image(image);
+ // https://discuss.multi-os-engine.org/t/stream-to-nsdata-and-moe-pointer-magic/306
+ BytePtr ptr = PtrFactory.newByteArray(bytes);
+ NSData data = NSData.dataWithBytesLength( ptr, bytes.length );
+ UIImage image = UIImage.imageWithData( data );
+ return new Image(image);
+ }
+ catch (Exception ex) {
+ throw new IOException(ex);
+ }
}
- catch (Exception ex) {
- throw new IOException(ex);
- }
- }
*/
- InputStream in = Image.class.getResourceAsStream(resource);
- if (in == null) {
- throw new IOException("can not find: " + resource);
+ InputStream in = Image.class.getResourceAsStream(resource);
+ if (in == null) {
+ throw new IOException("can not find: " + resource);
+ }
+ Image image = createImage(in);
+ in.close();
+ return image;
+
}
- Image image = createImage(in);
- in.close();
- return image;
+ finally {
+ ObjCRuntime.releaseAutoreleasePool(pool);
+ }
}
private static UIImage grow9patch(UIImage img) {
@@ -155,21 +163,27 @@
public static Image createImage(byte[] imgData, int offset, int length) {
- // https://discuss.multi-os-engine.org/t/stream-to-nsdata-and-moe-pointer-magic/306
- BytePtr ptr;
- if (offset == 0 && length == imgData.length) {
- ptr = PtrFactory.newByteArray(imgData);
+ long pool = ObjCRuntime.createAutoreleasePool();
+ try {
+
+ // https://discuss.multi-os-engine.org/t/stream-to-nsdata-and-moe-pointer-magic/306
+ BytePtr ptr;
+ if (offset == 0 && length == imgData.length) {
+ ptr = PtrFactory.newByteArray(imgData);
+ } else {
+ ptr = PtrFactory.newByteArray(length);
+ ptr.copyFrom(imgData, offset, 0, length);
+ }
+ NSData data = NSData.dataWithBytesLength(ptr, length);
+ UIImage image = UIImage.imageWithData(data);
+ if (image == null) {
+ throw new IllegalArgumentException("failed to make image from " + imgData + " " + offset + " " + length);
+ }
+ return new Image(image);
}
- else {
- ptr = PtrFactory.newByteArray(length);
- ptr.copyFrom(imgData, offset, 0, length);
+ finally {
+ ObjCRuntime.releaseAutoreleasePool(pool);
}
- NSData data = NSData.dataWithBytesLength(ptr, length);
- UIImage image = UIImage.imageWithData(data);
- if (image == null) {
- throw new IllegalArgumentException("failed to make image from " + imgData + " " + offset + " " + length);
- }
- return new Image(image);
}
public static Image createImage(Image image, int x, int y, int width, int height, int transform) {
@@ -177,13 +191,11 @@
throw new IllegalArgumentException("Area out of Image: "+image.getWidth()+"x"+image.getHeight()+" area: "+x+","+y+" "+width+"x"+height);
}
- // TODO only do this if image is immutable
UIImage newImg = image.getUIImage(x, y, width, height, transform);
return new Image(newImg);
}
public static Image createImage(int width, int height) {
-
UIKit.UIGraphicsBeginImageContext(new CGSize(width, height));
CGContextRef context = UIKit.UIGraphicsGetCurrentContext();
@@ -220,11 +232,6 @@
}
}
- @Override
- public String toString() {
- return "Image{mutable=" + mutable + " " + uiImage + " " + context + "}";
- }
-
public boolean isMutable() {
//return uiImage == null || uiImage.scale() == 1.0;
return mutable;
@@ -244,14 +251,6 @@
return (int) uiImage.size().height();
}
- private int getIntsPerRow() {
- long bytesPerRow = CoreGraphics.CGBitmapContextGetBytesPerRow(context);
- if (bytesPerRow % 4 != 0) {
- throw new IllegalStateException("odd number of bytes per row " + bytesPerRow);
- }
- return (int) bytesPerRow / 4;
- }
-
public synchronized Graphics getGraphics() {
if (!isMutable()) {
throw new IllegalStateException("Image is immutable");
@@ -259,8 +258,6 @@
// we must have used a image to draw, we need to clear it before we draw again to this context
if (uiImage != null) {
- //System.out.println("release image " + CoreFoundation.CFGetRetainCount(uiImage.CGImage()));
- CoreGraphics.CGImageRelease(uiImage.CGImage());
releaseUIImage();
}
@@ -274,23 +271,6 @@
* somehow prevented from being called at the same time as that would lead to possible images being created
* from the context as the same time as the context is being created for background threads to access img data
*/
- private synchronized void loadImageIntoGraphicsContext() {
- // the image has already been loaded into the context, do nothing
- if (context != null) {
- return;
- }
-
- // load the current image into the context
- UIKit.UIGraphicsBeginImageContext(new CGSize(getWidth(), getHeight()));
- context = UIKit.UIGraphicsGetCurrentContext();
- CoreGraphics.CGContextRetain(context);
-
- // this is needed for 9-patches to load correctly
- CoreGraphics.CGContextSetInterpolationQuality(context, CGInterpolationQuality.None);
-
- uiImage.drawAtPoint(CoreGraphics.CGPointZero());
- }
-
public synchronized UIImage getUIImage() {
// if image is imutable, we must have used the context just to get data, its safe to get rid of the context then.
@@ -312,49 +292,53 @@
*/
CGImageRef cgImageRef = CoreGraphics.CGBitmapContextCreateImage(context);
+ long pool = ObjCRuntime.createAutoreleasePool();
uiImage = UIImage.imageWithCGImage(cgImageRef);
+ ObjCRuntime.releaseAutoreleasePool(pool);
+
+ CoreGraphics.CGImageRelease(cgImageRef);
return uiImage;
+ }
-/*
- // if we have a context open we need to close it
- if (context != null) {
+ 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));
+ CGImageRef cropped = CoreGraphics.CGImageCreateWithImageInRect(start.CGImage(), srcRect);
- CGContextRef current = UIKit.UIGraphicsGetCurrentContext();
- boolean same = current != null && current.getPeer().equals(context.getPeer());
- if (!same) UIKit.UIGraphicsPushContext(context);
+ long pool = ObjCRuntime.createAutoreleasePool();
+ UIImage transformed;
+ if (transform == Sprite.TRANS_NONE && scale == 1.0) {
+ transformed = UIImage.imageWithCGImage(cropped);
+ }
+ else {
+ transformed = UIImage.imageWithCGImageScaleOrientation(cropped, scale, Graphics.getUIImageOrientation(transform));
+ }
+ ObjCRuntime.releaseAutoreleasePool(pool);
- // we may have created a context just to get data from the image
- // but if not, we need to get the image back from the context
- if (uiImage == null) {
- uiImage = UIKit.UIGraphicsGetImageFromCurrentImageContext();
- if (uiImage == null) {
- System.out.println("WARN UIKit not returning image, context matches: " + same);
+ CoreGraphics.CGImageRelease(cropped); // TODO not sure if needed as we neveer called Retain
- CGImageRef cgImageRef = CoreGraphics.CGBitmapContextCreateImage(context);
-
- if (cgImageRef == null) {
- throw new IllegalStateException("failed to get image from context " + context);
- }
-
- uiImage = UIImage.imageWithCGImage(cgImageRef);
- }
- }
-
- UIKit.UIGraphicsEndImageContext();
- CoreGraphics.CGContextRelease(context);
- context = null;
+ if (transformed.scale() != scale || (transformed.size().width() != width && transformed.size().width() != height)) {
+ throw new IllegalStateException("scale is not correct " + transformed.scale() +"="+ start.scale() +" "+ transformed.size().width() +"="+ width +" "+ transformed.size().height() +"="+ height);
}
- return uiImage;
-*/
+ return transformed;
}
+ @Override
+ public String toString() {
+ return "Image{mutable=" + mutable + " " + uiImage + " " + context + "}";
+ }
+
private void releaseCGContext() {
- context.free();
+ CoreGraphics.CGContextRelease(context);
context = null;
}
private void releaseUIImage() {
+ // as we always created UIImages inside pools, only java holds the referances to the objects
+ // so when we release them in java (through GC), they will also get released in iOS
+ // https://www.noisyfox.io/natj-memory-management.html
uiImage = null;
}
@@ -369,25 +353,12 @@
super.finalize();
}
- 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));
- CGImageRef cropped = CoreGraphics.CGImageCreateWithImageInRect(start.CGImage(), srcRect);
- UIImage transformed;
- if (transform == Sprite.TRANS_NONE && scale == 1.0) {
- transformed = UIImage.imageWithCGImage(cropped);
+ private int getIntsPerRow() {
+ long bytesPerRow = CoreGraphics.CGBitmapContextGetBytesPerRow(context);
+ if (bytesPerRow % 4 != 0) {
+ throw new IllegalStateException("odd number of bytes per row " + bytesPerRow);
}
- else {
- transformed = UIImage.imageWithCGImageScaleOrientation(cropped, scale, Graphics.getUIImageOrientation(transform));
- }
- CoreGraphics.CGImageRelease(cropped); // TODO not sure if needed as we neveer called Retain
-
- if (transformed.scale() != scale || (transformed.size().width() != width && transformed.size().width() != height)) {
- throw new IllegalStateException("scale is not correct " + transformed.scale() +"="+ start.scale() +" "+ transformed.size().width() +"="+ width +" "+ transformed.size().height() +"="+ height);
- }
-
- return transformed;
+ return (int) bytesPerRow / 4;
}
public void getRGB(int[] rgb, int offset, int distScanLength, int x, int y, int width, int height) {
@@ -405,8 +376,21 @@
}
*/
- loadImageIntoGraphicsContext();
+ synchronized (this) {
+ // if the image has already been loaded into the context, do nothing
+ if (context == null) {
+ // load the current image into the context
+ UIKit.UIGraphicsBeginImageContext(new CGSize(getWidth(), getHeight()));
+ context = UIKit.UIGraphicsGetCurrentContext();
+ CoreGraphics.CGContextRetain(context);
+ // this is needed for 9-patches to load correctly
+ CoreGraphics.CGContextSetInterpolationQuality(context, CGInterpolationQuality.None);
+
+ uiImage.drawAtPoint(CoreGraphics.CGPointZero());
+ }
+ }
+
//CoreGraphics.CGBitmapContextGetBitsPerComponent(context); // 8
//CoreGraphics.CGBitmapContextGetBitsPerPixel(context); // 32
int srcScanLenght = getIntsPerRow();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-28 19:32:49
|
Revision: 2549
http://sourceforge.net/p/swingme/code/2549
Author: yuranet
Date: 2021-07-28 19:32:47 +0000 (Wed, 28 Jul 2021)
Log Message:
-----------
does not leak memory quite as much as before
Modified Paths:
--------------
iOSME/src/javax/microedition/lcdui/Image.java
Modified: iOSME/src/javax/microedition/lcdui/Image.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Image.java 2021-07-28 17:40:37 UTC (rev 2548)
+++ iOSME/src/javax/microedition/lcdui/Image.java 2021-07-28 19:32:47 UTC (rev 2549)
@@ -259,6 +259,8 @@
// we must have used a image to draw, we need to clear it before we draw again to this context
if (uiImage != null) {
+ //System.out.println("release image " + CoreFoundation.CFGetRetainCount(uiImage.CGImage()));
+ CoreGraphics.CGImageRelease(uiImage.CGImage());
releaseUIImage();
}
@@ -353,8 +355,6 @@
}
private void releaseUIImage() {
- //System.out.println("TODO need to release image " + uiImage);
- //uiImage.CGImage().free();
uiImage = null;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-28 17:40:40
|
Revision: 2548
http://sourceforge.net/p/swingme/code/2548
Author: yuranet
Date: 2021-07-28 17:40:37 +0000 (Wed, 28 Jul 2021)
Log Message:
-----------
keep same context around when using mutable images
Modified Paths:
--------------
iOSME/src/javax/microedition/lcdui/Image.java
Modified: iOSME/src/javax/microedition/lcdui/Image.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Image.java 2021-07-28 14:26:03 UTC (rev 2547)
+++ iOSME/src/javax/microedition/lcdui/Image.java 2021-07-28 17:40:37 UTC (rev 2548)
@@ -29,10 +29,14 @@
*/
public class Image {
+ private final boolean mutable;
+
private UIImage uiImage;
private CGContextRef context;
public Image(UIImage img) {
+ mutable = false;
+
if (img == null) {
throw new NullPointerException();
}
@@ -39,6 +43,8 @@
this.uiImage = img;
}
private Image(CGContextRef context) {
+ mutable = true;
+
if (context == null) {
throw new NullPointerException();
}
@@ -216,11 +222,12 @@
@Override
public String toString() {
- return "Image{" + uiImage + " " + context + "}";
+ return "Image{mutable=" + mutable + " " + uiImage + " " + context + "}";
}
public boolean isMutable() {
- return uiImage == null || uiImage.scale() == 1.0;
+ //return uiImage == null || uiImage.scale() == 1.0;
+ return mutable;
}
public int getWidth() {
@@ -250,16 +257,13 @@
throw new IllegalStateException("Image is immutable");
}
- loadImageIntoGraphicsContext();
- Graphics displayGraphics = new Graphics(context);
- displayGraphics.setColor(0xFF000000);
-
- // we set image to null, so that when we go to get the image next, we will get it out of the image context
-
+ // we must have used a image to draw, we need to clear it before we draw again to this context
if (uiImage != null) {
- uiImage = null;
+ releaseUIImage();
}
+ Graphics displayGraphics = new Graphics(context);
+ displayGraphics.setColor(0xFF000000);
return displayGraphics;
}
@@ -286,6 +290,30 @@
}
public synchronized UIImage getUIImage() {
+
+ // if image is imutable, we must have used the context just to get data, its safe to get rid of the context then.
+ if (!mutable && context != null) {
+ releaseCGContext();
+ }
+
+ if (uiImage != null) {
+ return uiImage;
+ }
+
+ /*
+ * Note that in some cases the copy will actually follow "copy-on-write"
+ * semantics, so that the actual physical copy of the bits will only occur
+ * if the underlying data in the bitmap context is modified. As a
+ * consequence, you may wish to use the resulting image and release it
+ * before performing more drawing into the bitmap context; in this way, the
+ * actual physical copy of the data may be avoided.
+ */
+ CGImageRef cgImageRef = CoreGraphics.CGBitmapContextCreateImage(context);
+
+ uiImage = UIImage.imageWithCGImage(cgImageRef);
+ return uiImage;
+
+/*
// if we have a context open we need to close it
if (context != null) {
@@ -316,14 +344,28 @@
}
return uiImage;
+*/
}
+ private void releaseCGContext() {
+ context.free();
+ context = null;
+ }
+
+ private void releaseUIImage() {
+ //System.out.println("TODO need to release image " + uiImage);
+ //uiImage.CGImage().free();
+ uiImage = null;
+ }
+
@Override
protected void finalize() throws Throwable {
if (context != null) {
- System.out.println("WARN unused context in finalize " + CoreFoundation.CFGetRetainCount(context) + " " + this);
- CoreGraphics.CGContextRelease(context);
+ releaseCGContext();
}
+ if (uiImage != null) {
+ releaseUIImage();
+ }
super.finalize();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-28 14:26:05
|
Revision: 2547
http://sourceforge.net/p/swingme/code/2547
Author: yuranet
Date: 2021-07-28 14:26:03 +0000 (Wed, 28 Jul 2021)
Log Message:
-----------
log warning about size
Modified Paths:
--------------
iOSME/src/javax/microedition/lcdui/Image.java
Modified: iOSME/src/javax/microedition/lcdui/Image.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Image.java 2021-07-28 13:36:59 UTC (rev 2546)
+++ iOSME/src/javax/microedition/lcdui/Image.java 2021-07-28 14:26:03 UTC (rev 2547)
@@ -60,6 +60,10 @@
if (img != null) {
+ if (img.size().width() % 1 != 0 || img.size().height() % 1 != 0) {
+ System.out.println("WARN strange image size " + resource + " " + UIKit.NSStringFromCGSize(img.size()));
+ }
+
if (resource.endsWith(".9.png") && img.scale() != 1.0) {
img = grow9patch(img);
if (img.scale() == 3.0) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-28 13:37:05
|
Revision: 2546
http://sourceforge.net/p/swingme/code/2546
Author: yuranet
Date: 2021-07-28 13:36:59 +0000 (Wed, 28 Jul 2021)
Log Message:
-----------
all 9 patches load correctly
Modified Paths:
--------------
iOSME/src/javax/microedition/lcdui/Image.java
Modified: iOSME/src/javax/microedition/lcdui/Image.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Image.java 2021-07-13 13:41:34 UTC (rev 2545)
+++ iOSME/src/javax/microedition/lcdui/Image.java 2021-07-28 13:36:59 UTC (rev 2546)
@@ -9,6 +9,9 @@
import org.moe.natj.general.ptr.BytePtr;
import org.moe.natj.general.ptr.IntPtr;
import org.moe.natj.general.ptr.impl.PtrFactory;
+import org.moe.natj.objc.ObjCRuntime;
+import apple.corefoundation.c.CoreFoundation;
+import apple.coregraphics.enums.CGInterpolationQuality;
import apple.coregraphics.opaque.CGContextRef;
import apple.coregraphics.opaque.CGImageRef;
import apple.coregraphics.struct.CGPoint;
@@ -56,6 +59,14 @@
img = UIImage.imageNamed("Graphics" + resource);
if (img != null) {
+
+ if (resource.endsWith(".9.png") && img.scale() != 1.0) {
+ img = grow9patch(img);
+ if (img.scale() == 3.0) {
+ img = grow9patch(img);
+ }
+ }
+
return new Image(img);
}
@@ -87,6 +98,40 @@
return image;
}
+ private static UIImage grow9patch(UIImage img) {
+ double scale = img.scale();
+ double extraPointsNeeded = 1.0 / scale;
+ 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);
+
+ img = UIKit.UIGraphicsGetImageFromCurrentImageContext();
+ UIKit.UIGraphicsEndImageContext();
+ return img;
+ }
+
+ private static void drawRegion(UIImage img, double xSrc, double ySrc, double width, double height, double xDst, double yDst) {
+ CGContextRef context = UIKit.UIGraphicsGetCurrentContext();
+
+ CGRect oldClip = CoreGraphics.CGContextGetClipBoundingBox(context);
+ CGRect clip = new CGRect(new CGPoint(xDst, yDst), new CGSize(width, height));
+ CoreGraphics.CGContextClipToRect(context, clip);
+
+ img.drawAtPoint(new CGPoint(xDst - xSrc, yDst - ySrc));
+
+ CoreGraphics.CGContextResetClip(context);
+ CoreGraphics.CGContextClipToRect(context, oldClip);
+ }
+
public static Image createImage(InputStream stream) throws IOException {
int available = stream.available();
int size = Math.max(available, 8 * 1024);
@@ -206,7 +251,11 @@
displayGraphics.setColor(0xFF000000);
// we set image to null, so that when we go to get the image next, we will get it out of the image context
- uiImage = null;
+
+ if (uiImage != null) {
+ uiImage = null;
+ }
+
return displayGraphics;
}
@@ -226,6 +275,9 @@
context = UIKit.UIGraphicsGetCurrentContext();
CoreGraphics.CGContextRetain(context);
+ // this is needed for 9-patches to load correctly
+ CoreGraphics.CGContextSetInterpolationQuality(context, CGInterpolationQuality.None);
+
uiImage.drawAtPoint(CoreGraphics.CGPointZero());
}
@@ -265,7 +317,7 @@
@Override
protected void finalize() throws Throwable {
if (context != null) {
- System.out.println("WARN unused context in finalize " + this);
+ System.out.println("WARN unused context in finalize " + CoreFoundation.CFGetRetainCount(context) + " " + this);
CoreGraphics.CGContextRelease(context);
}
super.finalize();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-13 13:41:36
|
Revision: 2545
http://sourceforge.net/p/swingme/code/2545
Author: yuranet
Date: 2021-07-13 13:41:34 +0000 (Tue, 13 Jul 2021)
Log Message:
-----------
removed unused java bytecode editor
Removed Paths:
-------------
AndroidME/fix_build.xml
AndroidME/lib/
Deleted: AndroidME/fix_build.xml
===================================================================
--- AndroidME/fix_build.xml 2021-07-12 12:48:40 UTC (rev 2544)
+++ AndroidME/fix_build.xml 2021-07-13 13:41:34 UTC (rev 2545)
@@ -1,17 +0,0 @@
-
-<project name="fix_Android" default="fix-build" basedir=".">
-
- <!-- Eclipse uses "bin" for its own output, so we do the same. -->
- <property name="outdir" location="bin" />
- <property name="AndroidFixResourceAsStream.jar" value="../AndroidME/lib/AndroidFixResourceAsStream.jar" />
-
- <target name="fix-build">
- <echo>Fixing build....</echo>
- <echo message="ClassPath: ${AndroidFixResourceAsStream.jar}"/>
-
- <java classname="net.yura.mobile.asm.AndroidFixer" classpath="${AndroidFixResourceAsStream.jar}">
- <arg value="net.yura.android.AndroidMeActivity"/>
- <arg value="${outdir}"/>
- </java>
- </target>
-</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-12 12:48:42
|
Revision: 2544
http://sourceforge.net/p/swingme/code/2544
Author: yuranet
Date: 2021-07-12 12:48:40 +0000 (Mon, 12 Jul 2021)
Log Message:
-----------
get rid of nasty grid menu code
Modified Paths:
--------------
AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java
Modified: AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java
===================================================================
--- AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java 2021-07-12 12:46:30 UTC (rev 2543)
+++ AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java 2021-07-12 12:48:40 UTC (rev 2544)
@@ -723,7 +723,6 @@
// API-14
dp.HIDDEN_MENU = ViewConfiguration.get( AndroidMeActivity.DEFAULT_ACTIVITY ).hasPermanentMenuKey();
- dp.GRID_MENU = dp.HIDDEN_MENU;
}
catch (Throwable ignored) { }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-12 12:46:32
|
Revision: 2543
http://sourceforge.net/p/swingme/code/2543
Author: yuranet
Date: 2021-07-12 12:46:30 +0000 (Mon, 12 Jul 2021)
Log Message:
-----------
get rid of nasty grid menu code
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/DesktopPane.java
SwingME/src/net/yura/mobile/gui/components/MenuBar.java
Modified: SwingME/src/net/yura/mobile/gui/DesktopPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/DesktopPane.java 2021-07-11 22:52:08 UTC (rev 2542)
+++ SwingME/src/net/yura/mobile/gui/DesktopPane.java 2021-07-12 12:46:30 UTC (rev 2543)
@@ -142,7 +142,6 @@
public boolean USE_SOFT_KEY_CLEAR; // Nokia S40 does not have a dedicated delete key
public boolean HIDDEN_MENU; // on old android and blackberry the menu and back are hardware buttons
public boolean HIDDEN_BACK;
- public boolean GRID_MENU; // on old android
public boolean DEFAULT_NO_FOCUS;
// object variables
@@ -205,7 +204,6 @@
QWERTY_KAYPAD = platform == Midlet.PLATFORM_ME4SE || platform == Midlet.PLATFORM_ANDROID || platform == Midlet.PLATFORM_IOS || (platform == Midlet.PLATFORM_BLACKBERRY && !KeyEvent.BLACKBERRY_ITUT);
USE_SOFT_KEY_CLEAR = platform == Midlet.PLATFORM_NOKIA_S40;
- GRID_MENU = platform == Midlet.PLATFORM_ANDROID;
desktop = this;
Modified: SwingME/src/net/yura/mobile/gui/components/MenuBar.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/MenuBar.java 2021-07-11 22:52:08 UTC (rev 2542)
+++ SwingME/src/net/yura/mobile/gui/components/MenuBar.java 2021-07-12 12:46:30 UTC (rev 2543)
@@ -312,41 +312,6 @@
return (owner != null && owner.isFrameMenuBar() );
}
- protected Component getComponentFor(int i,int offset) {
-
- Component c = super.getComponentFor(i, offset);
-
- if (getDesktopPane().GRID_MENU && firstMenu()) {
-
- final int size = getSize();
-
- final int topRowCols = size % cols; // items in the top row!
- final int h = (getHeight()+getDividerHeight())/((size/cols)+(topRowCols==0?0:1));
-
- final int ypos,mycols;
-
- if (i<topRowCols) {
- ypos = 0;
- mycols = topRowCols;
- }
- else {
- int x = i-topRowCols;
- i = x%cols; // i is now being defined as meaning the current col that i am on in thie row!!!
- mycols = cols;
- ypos = h*(x/cols)+(topRowCols==0?0:h);
- }
-
- final int w = (getWidth() + getDividerWidth()) /mycols;
-
- final int widthMinusDiv = (i==(mycols-1)) ? (getWidth() - w*i) : (w - getDividerWidth() );
- final int heightMinusDiv = h - getDividerHeight();
-
- c.setBounds(w*i, ypos, widthMinusDiv, heightMinusDiv);
- }
-
- return c;
- }
-
protected void workoutMinimumSize() {
DesktopPane dp = getDesktopPane();
@@ -371,81 +336,7 @@
// as it has not layed out the panel yet, as we are only in the workoutMinimumSize stage at this time
}
- if (dp.GRID_MENU) {
-
- int size = getSize();
- ListCellRenderer renderer = getCellRenderer();
-
- int w=0,h=0; // max width and height
-
- boolean icon =false;
- for(int i = 0; i < size; i++){
- Object item = getElementAt(i);
- if (item instanceof Button) {
- Button button = ((Button)item);
-
- // hack to change position of icons on buttons
- if ( firstMenu() ) {
- button.setHorizontalAlignment(Graphics.HCENTER);
- button.setVerticalAlignment(Graphics.VCENTER);
- button.setHorizontalTextPosition(Graphics.HCENTER);
- button.setVerticalTextPosition(Graphics.BOTTOM);
- }
-
- // this means the icon makes this item extra tall, so we will not need to
- // TODO the default android icons are very tall and so stretch this to be very tall even though they are positioned to the side of the text
- if (button.getIcon()!=null ) { // && (button.getVerticalTextPosition() == Graphics.TOP || button.getVerticalTextPosition() == Graphics.BOTTOM )) {
- icon = true;
- }
- }
-
- Component c = renderer.getListCellRendererComponent(this, item, i, false, false);
- c.workoutPreferredSize();
-
- if (w < c.getWidthWithBorder()) {
- w = c.getWidthWithBorder();
- }
- if (h < c.getHeightWithBorder()) {
- h = c.getHeightWithBorder();
- }
- }
-
- if (!icon) { // if we have no icons, we need extra height for fat fingers
- h = h + h/2;
- }
- if (w<h) { // if the width is too small we want to make it wider
- w = h;
- }
-
- // we should NEVER set a size to 0, so instead we use -1
- setFixedCellHeight(h==0?-1:h);
- setFixedCellWidth(w==0?-1:w);
-
- if (firstMenu()) {
-
- getWindow().setName("AndroidMenu");
- setLayoutOrientation( -1 );
-
- int in = 0;
- for (Component p=this;p!=null;p=p.getParent()) {
- in = p.getInsets().getRight() + p.getInsets().getLeft();
- }
- width = dp.getWidth() -in;
-
- cols = Math.max(Math.min( (width+getDividerWidth()) / (w+getDividerWidth() ),size),1); // TODO very long buttons will be truncated, is this ok?
-
- int rows = ((size / cols)+( (size%cols==0) ?0:1));
-
- cols = size/rows + ( (size%rows==0) ?0:1); // this is to not have a HUGE top row but if possible split the total cells into a nice grid
-
- height = (h*rows) + ((rows-1)*getDividerHeight());
-
- return;
- }
- }
-
super.workoutMinimumSize();
-
}
protected void paintDividers(Graphics2D g) {
@@ -456,35 +347,6 @@
int rows=size;
- if (getDesktopPane().GRID_MENU && firstMenu()) {
- int topRowCols = size % cols; // items in the top row!
- rows = ((size/cols)+(topRowCols==0?0:1));
-
- if (verticalDivider!=null) {
- int topRowHeight = 0;
- if (topRowCols>0) {
- topRowHeight = getHeight()/rows;
- int w = (getWidth()+getDividerWidth())/topRowCols;
- for (int c=1;c<topRowCols;c++) {
- int x = c*w;
- int y = verticalDivider.getLeft();
- g.translate(x, y);
- verticalDivider.paintBorder(this, g, 0, topRowHeight);
- g.translate(-x, -y);
- }
- }
-
- int w = (getWidth()+getDividerWidth())/cols;
- for (int c=1;c<cols;c++) {
- int x = c*w;
- int y = topRowHeight + verticalDivider.getLeft();
- g.translate(x, y);
- verticalDivider.paintBorder(this, g, 0, getHeight()-topRowHeight);
- g.translate(-x, -y);
- }
- }
- }
-
if (divider!=null) {
int h = (getHeight()+getDividerHeight())/rows;
for (int c=1;c<rows;c++) {
@@ -511,5 +373,4 @@
divider = (Border) theme.getProperty("divider", Style.ALL);
verticalDivider = (Border) theme.getProperty("verticalDivider", Style.ALL);
}
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-11 22:52:11
|
Revision: 2542
http://sourceforge.net/p/swingme/code/2542
Author: yuranet
Date: 2021-07-11 22:52:08 +0000 (Sun, 11 Jul 2021)
Log Message:
-----------
canvas size code cleanup and runtime ios warning fix
Modified Paths:
--------------
iOSME/src/javax/microedition/lcdui/Canvas.java
iOSME/src/javax/microedition/lcdui/Displayable.java
iOSME/src/net/yura/ios/CanvasView.java
Modified: iOSME/src/javax/microedition/lcdui/Canvas.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Canvas.java 2021-07-11 20:59:59 UTC (rev 2541)
+++ iOSME/src/javax/microedition/lcdui/Canvas.java 2021-07-11 22:52:08 UTC (rev 2542)
@@ -37,8 +37,6 @@
public static final int KEY_STAR = 42;
public static final int KEY_POUND = 35;
- private int usedWidth,usedHeight;
-
CanvasView canvasView;
protected Canvas() {
@@ -297,14 +295,6 @@
}
- protected void sizeChanged(int w, int h) {
-
- }
-
- public final void fireSizeChanged(int w, int h) {
- sizeChanged(w, h);
- }
-
@Override
public void initDisplayable(AppController controller) {
if (canvasView == null) {
Modified: iOSME/src/javax/microedition/lcdui/Displayable.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Displayable.java 2021-07-11 20:59:59 UTC (rev 2541)
+++ iOSME/src/javax/microedition/lcdui/Displayable.java 2021-07-11 22:52:08 UTC (rev 2542)
@@ -1,11 +1,9 @@
package javax.microedition.lcdui;
import net.yura.ios.AppController;
-
import java.lang.reflect.Method;
import java.util.Vector;
import javax.microedition.midlet.MIDlet;
-
import apple.uikit.UIView;
public abstract class Displayable {
@@ -13,6 +11,8 @@
private Vector<Command> commands = new Vector<Command>();
private Display currentDisplay;
+ private double width, height;
+
public void addCommand(Command command) {
boolean added = false;
for (int i = 0; i < this.commands.size(); i++) {
@@ -47,18 +47,28 @@
this.commandListener = commandListener;
}
- public int getWidth() {
- UIView view = this.getView();
- int w = (view == null) ? 0 : (int)view.frame().size().width();
+ public final void fireSizeChanged(double w, double h) {
+ width = w;
+ height = h;
+ try {
+ sizeChanged((int)w, (int)h);
+ }
+ catch (Throwable e) {
+ //Logger.warn(null, e);
+ e.printStackTrace(); // TODO
+ }
+ }
- return w;//(w <= 0) ? AndroidMeActivity.DEFAULT_ACTIVITY.getScreenWidth() : w;
+ protected void sizeChanged(int w, int h) {
+
}
+ public int getWidth() {
+ return (int) width;
+ }
+
public int getHeight() {
- UIView view = this.getView();
- int h = (view == null) ? 0 : (int)view.frame().size().height();
-
- return h;//(h <= 0) ? AndroidMeActivity.DEFAULT_ACTIVITY.getScreenHeight() : h;
+ return (int) height;
}
public Display getCurrentDisplay() {
Modified: iOSME/src/net/yura/ios/CanvasView.java
===================================================================
--- iOSME/src/net/yura/ios/CanvasView.java 2021-07-11 20:59:59 UTC (rev 2541)
+++ iOSME/src/net/yura/ios/CanvasView.java 2021-07-11 22:52:08 UTC (rev 2542)
@@ -36,7 +36,6 @@
private Canvas canvas;
private Graphics graphics = new Graphics();
- private double width, height;
public void setCanvas(Canvas canvas) {
this.canvas = canvas;
@@ -57,19 +56,9 @@
CGSize size = bounds.size();
// Check for size changes...
- if (width != size.width() || height != size.height()) {
-
+ if (canvas.getWidth() != size.width() || canvas.getHeight() != size.height()) {
// Notify Canvas clients
- try {
- canvas.fireSizeChanged(canvas.getWidth(), canvas.getHeight());
- }
- catch (Throwable e) {
- //Logger.warn(null, e);
- e.printStackTrace(); // TODO
- }
-
- width = size.width();
- height = size.height();
+ canvas.fireSizeChanged(size.width(), size.height());
}
graphics.setContext(UIKit.UIGraphicsGetCurrentContext());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-11 21:00:00
|
Revision: 2541
http://sourceforge.net/p/swingme/code/2541
Author: yuranet
Date: 2021-07-11 20:59:59 +0000 (Sun, 11 Jul 2021)
Log Message:
-----------
tooltip foreground color fix
Modified Paths:
--------------
AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java
Modified: AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java
===================================================================
--- AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java 2021-07-11 20:35:25 UTC (rev 2540)
+++ AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java 2021-07-11 20:59:59 UTC (rev 2541)
@@ -389,7 +389,9 @@
// --- Tooltip ---
Style tooltipStyle = new Style(defaultStyle);
- tooltipStyle.addBorder(getBorder(ctx, 0, android.R.drawable.toast_frame),Style.ALL);
+ Drawable toastFrame = getDrawable(ctx, 0, android.R.drawable.toast_frame);
+ tooltipStyle.addBorder(new AndroidBorder(toastFrame), Style.ALL);
+ tooltipStyle.addForeground(getTextColorFor(getColorAtCenter(toastFrame)), Style.ALL);
setStyleFor("ToolTip", tooltipStyle);
@@ -514,13 +516,11 @@
return null;
}
-
private Border getListDivider(Context ctx, int styleDef, int attr) {
Drawable divider2 = getDrawable(ctx, styleDef, attr);
int thickness2 = divider2.getIntrinsicHeight();
Rect thicknessRect2 = new Rect(thickness2,thickness2,0,0);
return new AndroidBorder(divider2, thicknessRect2);
-
}
private AndroidIcon createButtonIcon(Context ctx, int id) {
@@ -527,11 +527,10 @@
return new AndroidIcon(getDrawable(ctx, id, android.R.attr.button));
}
-
private Border getBorder(Context ctx, int styleDef, int attr) {
- Drawable d0 = getDrawable(ctx, styleDef, attr);
- if (d0 != null) {
- return new AndroidBorder(d0);
+ Drawable drawable = getDrawable(ctx, styleDef, attr);
+ if (drawable != null) {
+ return new AndroidBorder(drawable);
}
return EMPTY_BORDER;
}
@@ -539,14 +538,13 @@
// TODO not sure if this is needed, this is a quick hack to make menus usable
// though a better solution is needed to make all menu items including radio buttons consistent in size
private Border getBorder(Context ctx, int styleDef, int attr, Rect padding) {
- Drawable d0 = getDrawable(ctx, styleDef, attr);
- if (d0 != null) {
- return new AndroidBorder(d0, padding);
+ Drawable drawable = getDrawable(ctx, styleDef, attr);
+ if (drawable != null) {
+ return new AndroidBorder(drawable, padding);
}
return EMPTY_BORDER;
}
-
private static Drawable getDrawable(Context ctx, int defStyle, int defAttr) {
Drawable res = null;
@@ -703,8 +701,6 @@
return c;
}
-
-
public static int getTextColorFor(int c) {
int r = Color.red(c);
@@ -717,7 +713,6 @@
else {
return Color.WHITE;
}
-
}
@TargetApi(14)
@@ -732,5 +727,4 @@
}
catch (Throwable ignored) { }
}
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-11 20:35:28
|
Revision: 2540
http://sourceforge.net/p/swingme/code/2540
Author: yuranet
Date: 2021-07-11 20:35:25 +0000 (Sun, 11 Jul 2021)
Log Message:
-----------
fix for odd rounding on sizes
Modified Paths:
--------------
AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java
Modified: AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java
===================================================================
--- AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java 2021-07-11 20:33:32 UTC (rev 2539)
+++ AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java 2021-07-11 20:35:25 UTC (rev 2540)
@@ -59,7 +59,22 @@
bitmapDensity = DisplayMetrics.DENSITY_DEFAULT; // default to make numbers smaller, as less likely to cause a crash
}
double scale = (double) bitmapDensity / (double) systemDensity;
- bmp = Bitmap.createBitmap(bmp, (int) (x * scale), (int) (y * scale), (int) (w * scale), (int) (h * scale));
+
+ int scaledX = (int) (x * scale);
+ int scaledY = (int) (y * scale);
+ int scaledW = (int) (w * scale);
+ int scaledH = (int) (h * scale);
+
+ // sometimes the rounding makes the values too big
+ // we cant round down as then they will be too small (absolute width/height of images are rounded up by framework)
+ if (scaledX + scaledW > bmp.getWidth()) {
+ scaledX = bmp.getWidth() - scaledW;
+ }
+ if (scaledY + scaledH > bmp.getHeight()) {
+ scaledY = bmp.getHeight() - scaledH;
+ }
+
+ bmp = Bitmap.createBitmap(bmp, scaledX, scaledY, scaledW, scaledH);
bitmapDrawable = new BitmapDrawable(AndroidMeApp.getContext().getResources(), bmp);
}
return new AndroidIcon(bitmapDrawable);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-11 20:33:33
|
Revision: 2539
http://sourceforge.net/p/swingme/code/2539
Author: yuranet
Date: 2021-07-11 20:33:32 +0000 (Sun, 11 Jul 2021)
Log Message:
-----------
combobox overlap fix
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/components/ComboBox.java
Modified: SwingME/src/net/yura/mobile/gui/components/ComboBox.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/ComboBox.java 2021-07-11 18:48:42 UTC (rev 2538)
+++ SwingME/src/net/yura/mobile/gui/components/ComboBox.java 2021-07-11 20:33:32 UTC (rev 2539)
@@ -18,9 +18,7 @@
package net.yura.mobile.gui.components;
import java.util.Vector;
-
import javax.microedition.lcdui.Graphics;
-
import net.yura.mobile.gui.ActionListener;
import net.yura.mobile.gui.DesktopPane;
import net.yura.mobile.gui.Graphics2D;
@@ -99,9 +97,9 @@
}
- width = count + padding*2 + ((nonSelectedImage == null)?getFont().getHeight():nonSelectedImage.getIconWidth());
+ // if there are no icons set, the border must be handling the icon
+ width = count + padding*2 + ((nonSelectedImage == null) ? 0 : nonSelectedImage.getIconWidth());
height = hi + padding*2;
-
}
else {
// in case we are empty then use the normal size
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-11 18:48:45
|
Revision: 2538
http://sourceforge.net/p/swingme/code/2538
Author: yuranet
Date: 2021-07-11 18:48:42 +0000 (Sun, 11 Jul 2021)
Log Message:
-----------
9-patch fix
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/Graphics2D.java
SwingME/src/net/yura/mobile/gui/border/MatteBorder.java
SwingME/src/net/yura/mobile/gui/components/Menu.java
Modified: SwingME/src/net/yura/mobile/gui/Graphics2D.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/Graphics2D.java 2021-07-11 11:01:53 UTC (rev 2537)
+++ SwingME/src/net/yura/mobile/gui/Graphics2D.java 2021-07-11 18:48:42 UTC (rev 2538)
@@ -130,7 +130,7 @@
//#mdebug warn
if (w <= 0 || h <= 0) {
- Logger.warn("trying to draw Region with width="+w+" height="+h);
+ Logger.warn("trying to draw Region with width=" + w + " height=" + h + " " + src);
Logger.dumpStack();
}
//#enddebug
Modified: SwingME/src/net/yura/mobile/gui/border/MatteBorder.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/border/MatteBorder.java 2021-07-11 11:01:53 UTC (rev 2537)
+++ SwingME/src/net/yura/mobile/gui/border/MatteBorder.java 2021-07-11 18:48:42 UTC (rev 2538)
@@ -120,10 +120,12 @@
//System.out.print("START");
for (int c=0;c<length;c++) {
- // can come back as very large positive or negative number
- boolean nothing = insets[c] == 0;
+ // when nothing, can be 0x00000000 or have tiny alpha 0x01000000
+ // something can be negative number (0xff000000 or 0xbb000000) or positive (0x5f000000)
+ boolean nothing = insets[c] == 0 || (insets[c] >> 24 & 0xFF) < 10; // check alpha is less then 10
//System.out.print(nothing ? " " : "#");
+//System.out.print(insets[c]);
if (nothing && result[1]==0) {
result[0] = c+1;
@@ -133,7 +135,7 @@
}
}
-//System.out.println("END");
+//System.out.println("END " + result[0] + "-" + result[1]);
}
/**
Modified: SwingME/src/net/yura/mobile/gui/components/Menu.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Menu.java 2021-07-11 11:01:53 UTC (rev 2537)
+++ SwingME/src/net/yura/mobile/gui/components/Menu.java 2021-07-11 18:48:42 UTC (rev 2538)
@@ -248,7 +248,7 @@
private boolean isTopLevelMenu() {
Component parent1 = getParent();
- // return true if we are NOT in a mneubar, or if the menubar is horizontal
+ // return true if we are NOT in a menubar, or if the menubar is horizontal
return !(parent1 instanceof MenuBar) || ((MenuBar)parent1).getLayoutOrientation() == List.HORIZONTAL;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-11 11:01:55
|
Revision: 2537
http://sourceforge.net/p/swingme/code/2537
Author: yuranet
Date: 2021-07-11 11:01:53 +0000 (Sun, 11 Jul 2021)
Log Message:
-----------
do not accedently create too many uiImages or image contexts
Modified Paths:
--------------
iOSME/src/javax/microedition/lcdui/Image.java
Modified: iOSME/src/javax/microedition/lcdui/Image.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Image.java 2021-07-10 21:50:44 UTC (rev 2536)
+++ iOSME/src/javax/microedition/lcdui/Image.java 2021-07-11 11:01:53 UTC (rev 2537)
@@ -196,7 +196,7 @@
return (int) bytesPerRow / 4;
}
- public Graphics getGraphics() {
+ public synchronized Graphics getGraphics() {
if (!isMutable()) {
throw new IllegalStateException("Image is immutable");
}
@@ -210,7 +210,12 @@
return displayGraphics;
}
- private void loadImageIntoGraphicsContext() {
+ /**
+ * all methods that move the bitmap between states of UIImage and CGContextRef must be syncronised or
+ * somehow prevented from being called at the same time as that would lead to possible images being created
+ * from the context as the same time as the context is being created for background threads to access img data
+ */
+ private synchronized void loadImageIntoGraphicsContext() {
// the image has already been loaded into the context, do nothing
if (context != null) {
return;
@@ -224,7 +229,7 @@
uiImage.drawAtPoint(CoreGraphics.CGPointZero());
}
- public UIImage getUIImage() {
+ public synchronized UIImage getUIImage() {
// if we have a context open we need to close it
if (context != null) {
@@ -278,7 +283,7 @@
else {
transformed = UIImage.imageWithCGImageScaleOrientation(cropped, scale, Graphics.getUIImageOrientation(transform));
}
- CoreGraphics.CGImageRelease(cropped);
+ CoreGraphics.CGImageRelease(cropped); // TODO not sure if needed as we neveer called Retain
if (transformed.scale() != scale || (transformed.size().width() != width && transformed.size().width() != height)) {
throw new IllegalStateException("scale is not correct " + transformed.scale() +"="+ start.scale() +" "+ transformed.size().width() +"="+ width +" "+ transformed.size().height() +"="+ height);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-10 21:50:46
|
Revision: 2536
http://sourceforge.net/p/swingme/code/2536
Author: yuranet
Date: 2021-07-10 21:50:44 +0000 (Sat, 10 Jul 2021)
Log Message:
-----------
fix for main thread queue getting clogged up
Modified Paths:
--------------
iOSME/src/javax/microedition/lcdui/Canvas.java
iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java
Modified: iOSME/src/javax/microedition/lcdui/Canvas.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Canvas.java 2021-07-10 16:30:04 UTC (rev 2535)
+++ iOSME/src/javax/microedition/lcdui/Canvas.java 2021-07-10 21:50:44 UTC (rev 2536)
@@ -2,6 +2,8 @@
import net.yura.ios.AppController;
import net.yura.ios.CanvasView;
+import java.util.ArrayList;
+import java.util.List;
import apple.coregraphics.struct.CGPoint;
import apple.coregraphics.struct.CGRect;
import apple.coregraphics.struct.CGSize;
@@ -123,6 +125,33 @@
return res;
}
+ private final NSOperationQueue.Block_addOperationWithBlock backgroundRepaint = new NSOperationQueue.Block_addOperationWithBlock() {
+ @Override
+ public void call_addOperationWithBlock() {
+ synchronized (repaintsQueue) {
+ if (fullRepaint) {
+ canvasView.setNeedsDisplay();
+ fullRepaint = false;
+ }
+ else {
+ for (CGRect rect : repaintsQueue) {
+ canvasView.setNeedsDisplayInRect(rect);
+ }
+
+ //#mdebug debug
+ if (fpsRect != null) canvasView.setNeedsDisplayInRect(fpsRect);
+ //#enddebug
+ }
+ repaintsQueue.clear();
+ }
+ }
+ };
+
+ // we want to keep an internal java list of repaints, if we send every repaint into native queue
+ // the native queue will get clogged up with all the repaint calls and not do them on time.
+ private boolean fullRepaint;
+ 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));
// we can only ever call setNeedsDisplay from main thread or it does nothing
@@ -134,16 +163,17 @@
//#enddebug
}
else {
- NSOperationQueue.mainQueue().addOperationWithBlock(new NSOperationQueue.Block_addOperationWithBlock() {
- @Override
- public void call_addOperationWithBlock() {
- canvasView.setNeedsDisplayInRect(rect);
+ synchronized (repaintsQueue) {
+ if (fullRepaint) return;
- //#mdebug debug
- if (fpsRect != null) canvasView.setNeedsDisplayInRect(fpsRect);
- //#enddebug
+ if (repaintsQueue.isEmpty()) {
+ repaintsQueue.add(rect);
+ NSOperationQueue.mainQueue().addOperationWithBlock(backgroundRepaint);
}
- });
+ else {
+ repaintsQueue.add(rect);
+ }
+ }
}
}
@@ -154,12 +184,14 @@
canvasView.setNeedsDisplay();
}
else {
- NSOperationQueue.mainQueue().addOperationWithBlock(new NSOperationQueue.Block_addOperationWithBlock() {
- @Override
- public void call_addOperationWithBlock() {
- canvasView.setNeedsDisplay();
+ synchronized (repaintsQueue) {
+ if (fullRepaint) return;
+
+ fullRepaint = true;
+ if (repaintsQueue.isEmpty()) {
+ NSOperationQueue.mainQueue().addOperationWithBlock(backgroundRepaint);
}
- });
+ }
}
}
else {
Modified: iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java
===================================================================
--- iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java 2021-07-10 16:30:04 UTC (rev 2535)
+++ iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java 2021-07-10 21:50:44 UTC (rev 2536)
@@ -58,33 +58,66 @@
Style defaultStyle = getStyle("");
Style checkBoxRenderer = new Style(defaultStyle);
- // TODO not working checkBoxRenderer.addBorder(new EmptyBorder(20,10,20,10), Style.ALL);
+ UIColor white = UIColor.whiteColor();
- Icon folderIcon = getSystemImageInWhite("folder"); // folder.fill
- checkBoxRenderer.addProperty(folderIcon, "folderIcon", Style.ALL);
+ Icon folderIcon = getSystemImage("folder", white); // folder.fill
+ if (folderIcon != null) checkBoxRenderer.addProperty(folderIcon, "folderIcon", Style.ALL);
- Icon imageIcon = getSystemImageInWhite("photo"); // photo.fill
- checkBoxRenderer.addProperty(imageIcon, "imageIcon", Style.ALL);
+ Icon imageIcon = getSystemImage("photo", white); // photo.fill
+ if (imageIcon != null) checkBoxRenderer.addProperty(imageIcon, "imageIcon", Style.ALL);
- Icon soundIcon = getSystemImageInWhite("speaker"); // hifispeaker.fill speaker.fill
- checkBoxRenderer.addProperty(soundIcon, "soundIcon", Style.ALL);
+ Icon soundIcon = getSystemImage("speaker", white); // hifispeaker.fill speaker.fill
+ if (soundIcon != null) checkBoxRenderer.addProperty(soundIcon, "soundIcon", Style.ALL);
- Icon videoIcon = getSystemImageInWhite("video"); // film.fill video.fill
- checkBoxRenderer.addProperty(videoIcon, "videoIcon", Style.ALL);
+ Icon videoIcon = getSystemImage("video", white); // film.fill video.fill
+ if (videoIcon != null) checkBoxRenderer.addProperty(videoIcon, "videoIcon", Style.ALL);
- Icon unknownIcon = getSystemImageInWhite("doc"); // doc.fill
- checkBoxRenderer.addProperty(unknownIcon, "unknownIcon", Style.ALL);
+ Icon unknownIcon = getSystemImage("doc", white); // doc.fill
+ if (unknownIcon != null) checkBoxRenderer.addProperty(unknownIcon, "unknownIcon", Style.ALL);
setStyleFor("CheckBoxRenderer", checkBoxRenderer);
Style menuItem = new Style(defaultStyle);
- menuItem.addProperty(new Icon(new Image(UIImage.systemImageNamed("chevron.right"))), "arrow", Style.ALL);
+ Icon arrow = getSystemImage("chevron.right", null);
+ if (arrow != null) menuItem.addProperty(arrow, "arrow", Style.ALL);
setStyleFor("MenuItem", menuItem);
+
+
+ Style spinner = new Style(defaultStyle);
+ spinner.addBorder(new EmptyBorder(0, 20, 0, 20), Style.ALL);
+ UIColor blue = UIColor.systemBlueColor();
+ UIColor gray = UIColor.systemGrayColor();
+ Icon iconLeft = getSystemImage("minus.square.fill", null);
+ Icon iconRight = getSystemImage("plus.square.fill", null);
+ if (iconLeft != null) spinner.addProperty(iconLeft, "iconLeft", Style.ALL);
+ if (iconRight != null) spinner.addProperty(iconRight, "iconRight", Style.ALL);
+ iconLeft = getSystemImage("minus.square.fill", blue);
+ iconRight = getSystemImage("plus.square.fill", blue);
+ if (iconLeft != null) spinner.addProperty(iconLeft, "iconLeft", Style.SELECTED);
+ if (iconRight != null) spinner.addProperty(iconRight, "iconRight", Style.SELECTED);
+ //spinner.addProperty(getSystemImage("minus.square.fill", gray), "iconLeft", Style.DISABLED);
+ //spinner.addProperty(getSystemImage("plus.square.fill", gray), "iconRight", Style.DISABLED);
+ setStyleFor("Spinner", spinner);
+
+
+
+
+ // TODO make sure list items are big enough to press with finger
+ // not working checkBoxRenderer.addBorder(new EmptyBorder(20,10,20,10), Style.ALL);
}
- private static Icon getSystemImageInWhite(String name) {
- UIImage image = UIImage.systemImageNamed(name);
- image = image.imageWithTintColor(UIColor.whiteColor());
+ private static Icon getSystemImage(String name, UIColor color) {
+ UIImage image;
+ try {
+ image = UIImage.systemImageNamed(name);
+ }
+ catch (Throwable th) {
+ System.out.println("can not find system image: " + name);
+ return null;
+ }
+ if (color != null) {
+ image = image.imageWithTintColor(color);
+ }
return new Icon(new Image(image));
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
