Fix compute resolutions in Canvas

woesss · Jan 20, 2024 · 6f389b4 · 6f389b4
1 parent 3374392
commit 6f389b4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/app/src/main/java/javax/microedition/lcdui/Canvas.java b/app/src/main/java/javax/microedition/lcdui/Canvas.java
@@ -330,23 +330,23 @@ public void updateSize() {
 			}
 		}
 
-		if (virtualWidth > 0) {
-			if (virtualHeight > 0) {
+		if (settings.screenWidth > 0) {
+			if (settings.screenHeight > 0) {
 				// the width and height of the canvas are strictly set
-				width = virtualWidth;
-				height = virtualHeight;
+				width = settings.screenWidth;
+				height = settings.screenHeight;
 			} else {
 				// only the canvas width is set
 				// height is selected by the ratio of the real screen
-				width = virtualWidth;
-				height = scaledDisplayHeight * virtualWidth / scaledDisplayWidth;
+				width = settings.screenWidth;
+				height = scaledDisplayHeight * settings.screenWidth / scaledDisplayWidth;
 			}
 		} else {
-			if (virtualHeight > 0) {
+			if (settings.screenHeight > 0) {
 				// only the canvas height is set
 				// width is selected by the ratio of the real screen
-				width = scaledDisplayWidth * virtualHeight / scaledDisplayHeight;
-				height = virtualHeight;
+				width = scaledDisplayWidth * settings.screenHeight / scaledDisplayHeight;
+				height = settings.screenHeight;
 			} else {
 				// nothing is set - screen-sized canvas
 				width = scaledDisplayWidth;

diff --git a/app/src/main/java/javax/microedition/lcdui/Displayable.java b/app/src/main/java/javax/microedition/lcdui/Displayable.java
@@ -40,8 +40,8 @@ public abstract class Displayable {
 	private static final int TICKER_SHOW = 1;
 	private static final int TICKER_HIDE = 2;
 
-	protected static int virtualWidth;
-	protected static int virtualHeight;
+	private static int virtualWidth;
+	private static int virtualHeight;
 
 	final ArrayList<Command> commands = new ArrayList<>();
 	CommandListener listener;