Bugfixes

.settings/org.eclipse.core.resources.prefs

@@ -1,9 +1,9 @@
 eclipse.preferences.version=1
 encoding//src/jar-specific/java=UTF-8
-encoding//src/js-specific/java=UTF-8
 encoding//src/main/java=UTF-8
 encoding//src/main/java/org/warp/picalculator/gui/expression/blocks/BlockParenthesis.java=UTF-8
 encoding//src/main/java/org/warp/picalculator/math/MathematicalSymbols.java=UTF-8
 encoding//src/main/resources=UTF-8
 encoding//src/main/rules=UTF-8
+encoding//src/teavm-specific/java=UTF-8
 encoding//src/test/java=UTF-8

pom.xml

@@ -128,9 +128,9 @@
 			</build>
 		</profile>
 		<profile>
-			<id>jsprofile</id>
+			<id>teavmprofile</id>
 			<properties>
-				<src.dir>js-specific</src.dir>
+				<src.dir>teavm-specific</src.dir>
 				<src.dir2>src/main/rules</src.dir2>
 			</properties>
 			<activation>

src/main/java/org/warp/picalculator/gui/DisplayManager.java

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.commons.lang3.tuple.Pair;
 import org.warp.picalculator.ConsoleUtils;
 import org.warp.picalculator.PlatformUtils;
 import org.warp.picalculator.StaticVars;
@@ -402,7 +403,15 @@ public final class DisplayManager implements RenderingLoop {
 			
 			Observable<Long> workTimer = Observable.interval(tickDuration);
 			
-			Observable.combineChanged(workTimer, engine.onResize()).subscribe((pair) -> {
+			Observable<Integer[]> onResizeObservable = engine.onResize();
+			Observable<Pair<Long, Integer[]>> refreshObservable;
+			if (onResizeObservable == null) {
+				refreshObservable = workTimer.map((l) -> Pair.of(l, null));
+			} else {
+				refreshObservable = Observable.combineChanged(workTimer, engine.onResize());
+			}
+			
+			refreshObservable.subscribe((pair) -> {
 				double dt = 0;
 				final long newtime = System.nanoTime();
 				if (precTime == -1) {

src/main/java/org/warp/picalculator/gui/graphicengine/headless24bit/Headless24bitEngine.java

@@ -9,7 +9,7 @@ import org.warp.picalculator.StaticVars;
 import org.warp.picalculator.Utils;
 import org.warp.picalculator.device.Keyboard;
 import org.warp.picalculator.event.Key;
-import org.warp.picalculator.flow.DObservable;
+import org.warp.picalculator.flow.Observable;
 import org.warp.picalculator.gui.graphicengine.Renderer;
 import org.warp.picalculator.gui.graphicengine.RenderingLoop;
 
@@ -139,7 +139,7 @@ public class Headless24bitEngine implements org.warp.picalculator.gui.graphiceng
 	}
 
 	@Override
-	public DObservable<Integer[]> onResize() {
+	public Observable<Integer[]> onResize() {
 		return null;
 	}
 

src/main/java/org/warp/picalculator/gui/graphicengine/headless256/Headless256Engine.java

@@ -9,7 +9,7 @@ import org.warp.picalculator.StaticVars;
 import org.warp.picalculator.Utils;
 import org.warp.picalculator.device.Keyboard;
 import org.warp.picalculator.event.Key;
-import org.warp.picalculator.flow.DObservable;
+import org.warp.picalculator.flow.Observable;
 import org.warp.picalculator.gui.graphicengine.Renderer;
 import org.warp.picalculator.gui.graphicengine.RenderingLoop;
 import org.warp.picalculator.gui.graphicengine.headless24bit.Headless24bitRenderer;
@@ -138,7 +138,7 @@ public class Headless256Engine implements org.warp.picalculator.gui.graphicengin
 	}
 
 	@Override
-	public DObservable<Integer[]> onResize() {
+	public Observable<Integer[]> onResize() {
 		return null;
 	}
 

src/main/java/org/warp/picalculator/gui/graphicengine/headless8/Headless8Engine.java

@@ -9,7 +9,7 @@ import org.warp.picalculator.StaticVars;
 import org.warp.picalculator.Utils;
 import org.warp.picalculator.device.Keyboard;
 import org.warp.picalculator.event.Key;
-import org.warp.picalculator.flow.DObservable;
+import org.warp.picalculator.flow.Observable;
 import org.warp.picalculator.gui.graphicengine.Renderer;
 import org.warp.picalculator.gui.graphicengine.RenderingLoop;
 import org.warp.picalculator.gui.graphicengine.headless24bit.Headless24bitRenderer;
@@ -138,7 +138,7 @@ public class Headless8Engine implements org.warp.picalculator.gui.graphicengine.
 	}
 
 	@Override
-	public DObservable<Integer[]> onResize() {
+	public Observable<Integer[]> onResize() {
 		return null;
 	}