diff --git a/lib/gluegen-rt-natives-linux-amd64.jar b/lib/gluegen-rt-natives-linux-amd64.jar index 98177ccc5f..155be9ef5a 100644 Binary files a/lib/gluegen-rt-natives-linux-amd64.jar and b/lib/gluegen-rt-natives-linux-amd64.jar differ diff --git a/lib/gluegen-rt-natives-linux-armv6.jar b/lib/gluegen-rt-natives-linux-armv6.jar index 05c9783f4a..f7027e0af9 100644 Binary files a/lib/gluegen-rt-natives-linux-armv6.jar and b/lib/gluegen-rt-natives-linux-armv6.jar differ diff --git a/lib/gluegen-rt-natives-linux-armv6hf.jar b/lib/gluegen-rt-natives-linux-armv6hf.jar index 20b3e2bef5..b5bd2189e5 100644 Binary files a/lib/gluegen-rt-natives-linux-armv6hf.jar and b/lib/gluegen-rt-natives-linux-armv6hf.jar differ diff --git a/lib/gluegen-rt-natives-linux-i586.jar b/lib/gluegen-rt-natives-linux-i586.jar index 668bbbb5b8..53fd42b8b2 100644 Binary files a/lib/gluegen-rt-natives-linux-i586.jar and b/lib/gluegen-rt-natives-linux-i586.jar differ diff --git a/lib/gluegen-rt-natives-macosx-universal.jar b/lib/gluegen-rt-natives-macosx-universal.jar index 11999bc99a..7816f25691 100644 Binary files a/lib/gluegen-rt-natives-macosx-universal.jar and b/lib/gluegen-rt-natives-macosx-universal.jar differ diff --git a/lib/gluegen-rt-natives-windows-amd64.jar b/lib/gluegen-rt-natives-windows-amd64.jar index 43c1a95770..e3c6cd1f91 100644 Binary files a/lib/gluegen-rt-natives-windows-amd64.jar and b/lib/gluegen-rt-natives-windows-amd64.jar differ diff --git a/lib/gluegen-rt-natives-windows-i586.jar b/lib/gluegen-rt-natives-windows-i586.jar index b9aa134920..2b3c0fe59e 100644 Binary files a/lib/gluegen-rt-natives-windows-i586.jar and b/lib/gluegen-rt-natives-windows-i586.jar differ diff --git a/lib/gluegen-rt.jar b/lib/gluegen-rt.jar index a9957e6194..62b2071a72 100644 Binary files a/lib/gluegen-rt.jar and b/lib/gluegen-rt.jar differ diff --git a/lib/gluegen.jar b/lib/gluegen.jar new file mode 100644 index 0000000000..8363ab3a68 Binary files /dev/null and b/lib/gluegen.jar differ diff --git a/lib/jogl-all-natives-linux-amd64.jar b/lib/jogl-all-natives-linux-amd64.jar index 0f914e25e0..6b71431643 100644 Binary files a/lib/jogl-all-natives-linux-amd64.jar and b/lib/jogl-all-natives-linux-amd64.jar differ diff --git a/lib/jogl-all-natives-linux-armv6.jar b/lib/jogl-all-natives-linux-armv6.jar index 7076fb58fc..808088468a 100644 Binary files a/lib/jogl-all-natives-linux-armv6.jar and b/lib/jogl-all-natives-linux-armv6.jar differ diff --git a/lib/jogl-all-natives-linux-armv6hf.jar b/lib/jogl-all-natives-linux-armv6hf.jar new file mode 100644 index 0000000000..dacf1ba662 Binary files /dev/null and b/lib/jogl-all-natives-linux-armv6hf.jar differ diff --git a/lib/jogl-all-natives-linux-i586.jar b/lib/jogl-all-natives-linux-i586.jar index e969c9b60f..29da99356d 100644 Binary files a/lib/jogl-all-natives-linux-i586.jar and b/lib/jogl-all-natives-linux-i586.jar differ diff --git a/lib/jogl-all-natives-macosx-universal.jar b/lib/jogl-all-natives-macosx-universal.jar index 32f1567783..3fdb0cc284 100644 Binary files a/lib/jogl-all-natives-macosx-universal.jar and b/lib/jogl-all-natives-macosx-universal.jar differ diff --git a/lib/jogl-all-natives-windows-amd64.jar b/lib/jogl-all-natives-windows-amd64.jar index 8ca3682822..b8bd7bbd6b 100644 Binary files a/lib/jogl-all-natives-windows-amd64.jar and b/lib/jogl-all-natives-windows-amd64.jar differ diff --git a/lib/jogl-all-natives-windows-i586.jar b/lib/jogl-all-natives-windows-i586.jar index 1ff1289365..f0988add93 100644 Binary files a/lib/jogl-all-natives-windows-i586.jar and b/lib/jogl-all-natives-windows-i586.jar differ diff --git a/lib/jogl-all.jar b/lib/jogl-all.jar index 977f5f157f..8440b3dfcd 100644 Binary files a/lib/jogl-all.jar and b/lib/jogl-all.jar differ diff --git a/lib/natives/arm/libgluegen-rt.so b/lib/natives/arm/libgluegen-rt.so index 6d81e57479..f95dd328ba 100644 Binary files a/lib/natives/arm/libgluegen-rt.so and b/lib/natives/arm/libgluegen-rt.so differ diff --git a/lib/natives/arm/libjoal.so b/lib/natives/arm/libjoal.so index cc9b658c70..2d5a74dd1e 100644 Binary files a/lib/natives/arm/libjoal.so and b/lib/natives/arm/libjoal.so differ diff --git a/lib/natives/arm/libjocl.so b/lib/natives/arm/libjocl.so index b2ac79d34b..452c0a209c 100644 Binary files a/lib/natives/arm/libjocl.so and b/lib/natives/arm/libjocl.so differ diff --git a/lib/natives/arm/libjogl_cg.so b/lib/natives/arm/libjogl_cg.so index 13bc887eef..0973d680e8 100644 Binary files a/lib/natives/arm/libjogl_cg.so and b/lib/natives/arm/libjogl_cg.so differ diff --git a/lib/natives/arm/libjogl_desktop.so b/lib/natives/arm/libjogl_desktop.so index 02189cc21b..cc5b24de3c 100644 Binary files a/lib/natives/arm/libjogl_desktop.so and b/lib/natives/arm/libjogl_desktop.so differ diff --git a/lib/natives/arm/libjogl_mobile.so b/lib/natives/arm/libjogl_mobile.so index 73ced355d0..826139fa2a 100644 Binary files a/lib/natives/arm/libjogl_mobile.so and b/lib/natives/arm/libjogl_mobile.so differ diff --git a/lib/natives/arm/libnativewindow_awt.so b/lib/natives/arm/libnativewindow_awt.so index 5d925c84e0..030f15404d 100644 Binary files a/lib/natives/arm/libnativewindow_awt.so and b/lib/natives/arm/libnativewindow_awt.so differ diff --git a/lib/natives/arm/libnativewindow_x11.so b/lib/natives/arm/libnativewindow_x11.so index ee8fe1cccb..d11e646143 100644 Binary files a/lib/natives/arm/libnativewindow_x11.so and b/lib/natives/arm/libnativewindow_x11.so differ diff --git a/lib/natives/arm/libnewt.so b/lib/natives/arm/libnewt.so index 2d01e7e183..877d009e69 100644 Binary files a/lib/natives/arm/libnewt.so and b/lib/natives/arm/libnewt.so differ diff --git a/lib/natives/arm/libopenal.so b/lib/natives/arm/libopenal.so new file mode 100644 index 0000000000..1be2cdaf17 Binary files /dev/null and b/lib/natives/arm/libopenal.so differ diff --git a/lib/natives/linux32/libgluegen-rt.so b/lib/natives/linux32/libgluegen-rt.so index b58b5e1fec..e5d78eb97e 100644 Binary files a/lib/natives/linux32/libgluegen-rt.so and b/lib/natives/linux32/libgluegen-rt.so differ diff --git a/lib/natives/linux32/libjoal.so b/lib/natives/linux32/libjoal.so new file mode 100644 index 0000000000..8ba3535db9 Binary files /dev/null and b/lib/natives/linux32/libjoal.so differ diff --git a/lib/natives/linux32/libjocl.so b/lib/natives/linux32/libjocl.so new file mode 100644 index 0000000000..756c032af4 Binary files /dev/null and b/lib/natives/linux32/libjocl.so differ diff --git a/lib/natives/linux32/libjogl_cg.so b/lib/natives/linux32/libjogl_cg.so new file mode 100644 index 0000000000..b7caf085c1 Binary files /dev/null and b/lib/natives/linux32/libjogl_cg.so differ diff --git a/lib/natives/linux32/libjogl_desktop.so b/lib/natives/linux32/libjogl_desktop.so index 1fe60d53d3..642c9b3e2a 100644 Binary files a/lib/natives/linux32/libjogl_desktop.so and b/lib/natives/linux32/libjogl_desktop.so differ diff --git a/lib/natives/linux32/libjogl_mobile.so b/lib/natives/linux32/libjogl_mobile.so index db2849cfb2..8c61dad3b3 100644 Binary files a/lib/natives/linux32/libjogl_mobile.so and b/lib/natives/linux32/libjogl_mobile.so differ diff --git a/lib/natives/linux32/libnativewindow_awt.so b/lib/natives/linux32/libnativewindow_awt.so index 1a5446d69a..80d55deb3f 100644 Binary files a/lib/natives/linux32/libnativewindow_awt.so and b/lib/natives/linux32/libnativewindow_awt.so differ diff --git a/lib/natives/linux32/libnativewindow_x11.so b/lib/natives/linux32/libnativewindow_x11.so index 9e18ccd051..12cfdba0a0 100644 Binary files a/lib/natives/linux32/libnativewindow_x11.so and b/lib/natives/linux32/libnativewindow_x11.so differ diff --git a/lib/natives/linux32/libnewt.so b/lib/natives/linux32/libnewt.so index 9d00b7d56e..5d925ace9b 100644 Binary files a/lib/natives/linux32/libnewt.so and b/lib/natives/linux32/libnewt.so differ diff --git a/lib/natives/linux32/libopenal.so b/lib/natives/linux32/libopenal.so new file mode 100644 index 0000000000..bd4510fc9f Binary files /dev/null and b/lib/natives/linux32/libopenal.so differ diff --git a/lib/natives/linux64/libgluegen-rt.so b/lib/natives/linux64/libgluegen-rt.so index e24d5e0bad..da158f5104 100644 Binary files a/lib/natives/linux64/libgluegen-rt.so and b/lib/natives/linux64/libgluegen-rt.so differ diff --git a/lib/natives/linux64/libjoal.so b/lib/natives/linux64/libjoal.so new file mode 100644 index 0000000000..7e8d4cf091 Binary files /dev/null and b/lib/natives/linux64/libjoal.so differ diff --git a/lib/natives/linux64/libjocl.so b/lib/natives/linux64/libjocl.so new file mode 100644 index 0000000000..a7e76e4786 Binary files /dev/null and b/lib/natives/linux64/libjocl.so differ diff --git a/lib/natives/linux64/libjogl_cg.so b/lib/natives/linux64/libjogl_cg.so new file mode 100644 index 0000000000..c44757da22 Binary files /dev/null and b/lib/natives/linux64/libjogl_cg.so differ diff --git a/lib/natives/linux64/libjogl_desktop.so b/lib/natives/linux64/libjogl_desktop.so index f91d7c69c4..6a19bb8362 100644 Binary files a/lib/natives/linux64/libjogl_desktop.so and b/lib/natives/linux64/libjogl_desktop.so differ diff --git a/lib/natives/linux64/libjogl_mobile.so b/lib/natives/linux64/libjogl_mobile.so index 3da6eec9a5..8a7eb719f5 100644 Binary files a/lib/natives/linux64/libjogl_mobile.so and b/lib/natives/linux64/libjogl_mobile.so differ diff --git a/lib/natives/linux64/libnativewindow_awt.so b/lib/natives/linux64/libnativewindow_awt.so index be10b141f1..6ca2d58965 100644 Binary files a/lib/natives/linux64/libnativewindow_awt.so and b/lib/natives/linux64/libnativewindow_awt.so differ diff --git a/lib/natives/linux64/libnativewindow_x11.so b/lib/natives/linux64/libnativewindow_x11.so index 53100afc08..f7cd53dbc8 100644 Binary files a/lib/natives/linux64/libnativewindow_x11.so and b/lib/natives/linux64/libnativewindow_x11.so differ diff --git a/lib/natives/linux64/libnewt.so b/lib/natives/linux64/libnewt.so index d75793814c..e33c0df0ef 100644 Binary files a/lib/natives/linux64/libnewt.so and b/lib/natives/linux64/libnewt.so differ diff --git a/lib/natives/linux64/libopenal.so b/lib/natives/linux64/libopenal.so new file mode 100644 index 0000000000..f1b1449826 Binary files /dev/null and b/lib/natives/linux64/libopenal.so differ diff --git a/lib/natives/macosx/libgluegen-rt.dylib b/lib/natives/macosx/libgluegen-rt.dylib deleted file mode 100644 index 4d5eac6699..0000000000 Binary files a/lib/natives/macosx/libgluegen-rt.dylib and /dev/null differ diff --git a/lib/natives/macosx/libgluegen-rt.jnilib b/lib/natives/macosx/libgluegen-rt.jnilib index 4d5eac6699..aa06c64947 100644 Binary files a/lib/natives/macosx/libgluegen-rt.jnilib and b/lib/natives/macosx/libgluegen-rt.jnilib differ diff --git a/lib/natives/macosx/libjoal.jnilib b/lib/natives/macosx/libjoal.jnilib new file mode 100644 index 0000000000..43ad5ff782 Binary files /dev/null and b/lib/natives/macosx/libjoal.jnilib differ diff --git a/lib/natives/macosx/libjocl.jnilib b/lib/natives/macosx/libjocl.jnilib new file mode 100644 index 0000000000..f3886ff01e Binary files /dev/null and b/lib/natives/macosx/libjocl.jnilib differ diff --git a/lib/natives/macosx/libjogl_cg.jnilib b/lib/natives/macosx/libjogl_cg.jnilib new file mode 100644 index 0000000000..91c79058a3 Binary files /dev/null and b/lib/natives/macosx/libjogl_cg.jnilib differ diff --git a/lib/natives/macosx/libjogl_desktop.dylib b/lib/natives/macosx/libjogl_desktop.dylib deleted file mode 100644 index ebc22dcd50..0000000000 Binary files a/lib/natives/macosx/libjogl_desktop.dylib and /dev/null differ diff --git a/lib/natives/macosx/libjogl_desktop.jnilib b/lib/natives/macosx/libjogl_desktop.jnilib index ebc22dcd50..20ebd18ea9 100644 Binary files a/lib/natives/macosx/libjogl_desktop.jnilib and b/lib/natives/macosx/libjogl_desktop.jnilib differ diff --git a/lib/natives/macosx/libjogl_mobile.dylib b/lib/natives/macosx/libjogl_mobile.dylib deleted file mode 100644 index 9a4be3a7d6..0000000000 Binary files a/lib/natives/macosx/libjogl_mobile.dylib and /dev/null differ diff --git a/lib/natives/macosx/libjogl_mobile.jnilib b/lib/natives/macosx/libjogl_mobile.jnilib index 9a4be3a7d6..599eb129d6 100644 Binary files a/lib/natives/macosx/libjogl_mobile.jnilib and b/lib/natives/macosx/libjogl_mobile.jnilib differ diff --git a/lib/natives/macosx/libnativewindow_awt.dylib b/lib/natives/macosx/libnativewindow_awt.dylib deleted file mode 100644 index 90607796ad..0000000000 Binary files a/lib/natives/macosx/libnativewindow_awt.dylib and /dev/null differ diff --git a/lib/natives/macosx/libnativewindow_awt.jnilib b/lib/natives/macosx/libnativewindow_awt.jnilib index 90607796ad..2aa3bf2090 100644 Binary files a/lib/natives/macosx/libnativewindow_awt.jnilib and b/lib/natives/macosx/libnativewindow_awt.jnilib differ diff --git a/lib/natives/macosx/libnativewindow_macosx.dylib b/lib/natives/macosx/libnativewindow_macosx.dylib deleted file mode 100644 index 9b5c146f63..0000000000 Binary files a/lib/natives/macosx/libnativewindow_macosx.dylib and /dev/null differ diff --git a/lib/natives/macosx/libnativewindow_macosx.jnilib b/lib/natives/macosx/libnativewindow_macosx.jnilib index 9b5c146f63..bd4bc3408f 100644 Binary files a/lib/natives/macosx/libnativewindow_macosx.jnilib and b/lib/natives/macosx/libnativewindow_macosx.jnilib differ diff --git a/lib/natives/macosx/libnewt.dylib b/lib/natives/macosx/libnewt.dylib deleted file mode 100644 index 2396a0345f..0000000000 Binary files a/lib/natives/macosx/libnewt.dylib and /dev/null differ diff --git a/lib/natives/macosx/libnewt.jnilib b/lib/natives/macosx/libnewt.jnilib index 2396a0345f..c903b8ce65 100644 Binary files a/lib/natives/macosx/libnewt.jnilib and b/lib/natives/macosx/libnewt.jnilib differ diff --git a/lib/natives/macosx/libopenal.1.15.1.dylib b/lib/natives/macosx/libopenal.1.15.1.dylib new file mode 100644 index 0000000000..c763e3fcd0 Binary files /dev/null and b/lib/natives/macosx/libopenal.1.15.1.dylib differ diff --git a/lib/natives/macosx/libopenal.1.dylib b/lib/natives/macosx/libopenal.1.dylib new file mode 100644 index 0000000000..c763e3fcd0 Binary files /dev/null and b/lib/natives/macosx/libopenal.1.dylib differ diff --git a/lib/natives/macosx/libopenal.dylib b/lib/natives/macosx/libopenal.dylib new file mode 100644 index 0000000000..c763e3fcd0 Binary files /dev/null and b/lib/natives/macosx/libopenal.dylib differ diff --git a/lib/natives/windows32/gluegen-rt.dll b/lib/natives/windows32/gluegen-rt.dll index 409fd662fd..0e047e4cf0 100644 Binary files a/lib/natives/windows32/gluegen-rt.dll and b/lib/natives/windows32/gluegen-rt.dll differ diff --git a/lib/natives/windows32/joal.dll b/lib/natives/windows32/joal.dll new file mode 100644 index 0000000000..c30233e47f Binary files /dev/null and b/lib/natives/windows32/joal.dll differ diff --git a/lib/natives/windows32/jocl.dll b/lib/natives/windows32/jocl.dll new file mode 100644 index 0000000000..d34dc32722 Binary files /dev/null and b/lib/natives/windows32/jocl.dll differ diff --git a/lib/natives/windows32/jogl_cg.dll b/lib/natives/windows32/jogl_cg.dll new file mode 100644 index 0000000000..2c3e517277 Binary files /dev/null and b/lib/natives/windows32/jogl_cg.dll differ diff --git a/lib/natives/windows32/jogl_desktop.dll b/lib/natives/windows32/jogl_desktop.dll index 415602e9cc..6f7e49f048 100644 Binary files a/lib/natives/windows32/jogl_desktop.dll and b/lib/natives/windows32/jogl_desktop.dll differ diff --git a/lib/natives/windows32/jogl_mobile.dll b/lib/natives/windows32/jogl_mobile.dll index 5cb0d6b358..dc006efbe0 100644 Binary files a/lib/natives/windows32/jogl_mobile.dll and b/lib/natives/windows32/jogl_mobile.dll differ diff --git a/lib/natives/windows32/nativewindow_awt.dll b/lib/natives/windows32/nativewindow_awt.dll index d3868c7b22..1b61731911 100644 Binary files a/lib/natives/windows32/nativewindow_awt.dll and b/lib/natives/windows32/nativewindow_awt.dll differ diff --git a/lib/natives/windows32/nativewindow_win32.dll b/lib/natives/windows32/nativewindow_win32.dll index a9c0174d4e..67f727d2f2 100644 Binary files a/lib/natives/windows32/nativewindow_win32.dll and b/lib/natives/windows32/nativewindow_win32.dll differ diff --git a/lib/natives/windows32/newt.dll b/lib/natives/windows32/newt.dll index 46f5f8e7c5..b6d754feaf 100644 Binary files a/lib/natives/windows32/newt.dll and b/lib/natives/windows32/newt.dll differ diff --git a/lib/natives/windows32/soft_oal.dll b/lib/natives/windows32/soft_oal.dll new file mode 100644 index 0000000000..df4464bf39 Binary files /dev/null and b/lib/natives/windows32/soft_oal.dll differ diff --git a/lib/natives/windows64/gluegen-rt.dll b/lib/natives/windows64/gluegen-rt.dll index 9ea63b1c79..206b33925c 100644 Binary files a/lib/natives/windows64/gluegen-rt.dll and b/lib/natives/windows64/gluegen-rt.dll differ diff --git a/lib/natives/windows64/joal.dll b/lib/natives/windows64/joal.dll new file mode 100644 index 0000000000..79e13b78ef Binary files /dev/null and b/lib/natives/windows64/joal.dll differ diff --git a/lib/natives/windows64/jocl.dll b/lib/natives/windows64/jocl.dll new file mode 100644 index 0000000000..5bf57f7c08 Binary files /dev/null and b/lib/natives/windows64/jocl.dll differ diff --git a/lib/natives/windows64/jogl_cg.dll b/lib/natives/windows64/jogl_cg.dll new file mode 100644 index 0000000000..378aca2490 Binary files /dev/null and b/lib/natives/windows64/jogl_cg.dll differ diff --git a/lib/natives/windows64/jogl_desktop.dll b/lib/natives/windows64/jogl_desktop.dll index 2b278207f7..54069e5b91 100644 Binary files a/lib/natives/windows64/jogl_desktop.dll and b/lib/natives/windows64/jogl_desktop.dll differ diff --git a/lib/natives/windows64/jogl_mobile.dll b/lib/natives/windows64/jogl_mobile.dll index 9705b64177..93d662bfaa 100644 Binary files a/lib/natives/windows64/jogl_mobile.dll and b/lib/natives/windows64/jogl_mobile.dll differ diff --git a/lib/natives/windows64/nativewindow_awt.dll b/lib/natives/windows64/nativewindow_awt.dll index bf675633ea..712d036735 100644 Binary files a/lib/natives/windows64/nativewindow_awt.dll and b/lib/natives/windows64/nativewindow_awt.dll differ diff --git a/lib/natives/windows64/nativewindow_win32.dll b/lib/natives/windows64/nativewindow_win32.dll index 044d0800fe..16ca3c3f28 100644 Binary files a/lib/natives/windows64/nativewindow_win32.dll and b/lib/natives/windows64/nativewindow_win32.dll differ diff --git a/lib/natives/windows64/newt.dll b/lib/natives/windows64/newt.dll index aa7e2f9c40..735b2d591e 100644 Binary files a/lib/natives/windows64/newt.dll and b/lib/natives/windows64/newt.dll differ diff --git a/lib/natives/windows64/soft_oal.dll b/lib/natives/windows64/soft_oal.dll new file mode 100644 index 0000000000..2dba575bd9 Binary files /dev/null and b/lib/natives/windows64/soft_oal.dll differ diff --git a/src/com/willwinder/universalgcodesender/uielements/FPSCounter.java b/src/com/willwinder/universalgcodesender/uielements/FPSCounter.java index 3ed4088d6d..7f3c2d1a48 100644 --- a/src/com/willwinder/universalgcodesender/uielements/FPSCounter.java +++ b/src/com/willwinder/universalgcodesender/uielements/FPSCounter.java @@ -166,19 +166,19 @@ public void draw() { } if (fpsText != null) { - renderer.beginRendering(drawable.getWidth(), drawable.getHeight()); + renderer.beginRendering(drawable.getSurfaceWidth(), drawable.getSurfaceHeight()); // Figure out the location at which to draw the text int x = 0; int y = 0; switch (textLocation) { case UPPER_LEFT: x = fpsOffset; - y = drawable.getHeight() - fpsHeight - fpsOffset; + y = drawable.getSurfaceHeight() - fpsHeight - fpsOffset; break; case UPPER_RIGHT: - x = drawable.getWidth() - fpsWidth - fpsOffset; - y = drawable.getHeight() - fpsHeight - fpsOffset; + x = drawable.getSurfaceWidth() - fpsWidth - fpsOffset; + y = drawable.getSurfaceHeight() - fpsHeight - fpsOffset; break; case LOWER_LEFT: @@ -187,7 +187,7 @@ public void draw() { break; case LOWER_RIGHT: - x = drawable.getWidth() - fpsWidth - fpsOffset; + x = drawable.getSurfaceWidth() - fpsWidth - fpsOffset; y = fpsOffset; break; } diff --git a/src/com/willwinder/universalgcodesender/uielements/Overlay.java b/src/com/willwinder/universalgcodesender/uielements/Overlay.java index 9a69b6cab1..4c8237bec4 100644 --- a/src/com/willwinder/universalgcodesender/uielements/Overlay.java +++ b/src/com/willwinder/universalgcodesender/uielements/Overlay.java @@ -146,7 +146,7 @@ public void setColor(float r, float g, float b, float a) throws GLException { public void draw(String text) { text = text.trim(); if (text != null || text != "") { - renderer.beginRendering(drawable.getWidth(), drawable.getHeight()); + renderer.beginRendering(drawable.getSurfaceWidth(), drawable.getSurfaceHeight()); Rectangle2D bounds = renderer.getBounds(text); width = (int) bounds.getWidth(); @@ -159,12 +159,12 @@ public void draw(String text) { switch (textLocation) { case UPPER_LEFT: x = offset; - y = drawable.getHeight() - height - offset; + y = drawable.getSurfaceHeight() - height - offset; break; case UPPER_RIGHT: - x = drawable.getWidth() - width - offset; - y = drawable.getHeight() - height - offset; + x = drawable.getSurfaceWidth() - width - offset; + y = drawable.getSurfaceHeight() - height - offset; break; case LOWER_LEFT: @@ -173,7 +173,7 @@ public void draw(String text) { break; case LOWER_RIGHT: - x = drawable.getWidth() - width - offset; + x = drawable.getSurfaceWidth() - width - offset; y = offset; break; }