Merge pull request #636 from hx2A/macos-javafx

Macos javafx

Author: hx2A

py5_jar/src/main/java/py5/core/Sketch.java

@@ -190,12 +190,12 @@ public void setup() {
     if (success) {
       PSurface surface = getSurface();
 
-      // request focus for Java2D renderer on Windows and MacOS
-      if (platform == WINDOWS && sketchRenderer().equals(JAVA2D)) {
+      // request focus for Java2D and FX2D renderers on Windows and MacOS
+      if (platform == WINDOWS && (sketchRenderer().equals(JAVA2D) || sketchRenderer().equals(FX2D))) {
         Canvas canvas = (Canvas) surface.getNative();
         canvas.setFocusable(true);
         canvas.requestFocus();
-      } else if (platform == MACOS && (sketchRenderer().equals(JAVA2D) || g.isGL())) {
+      } else if (platform == MACOS && (sketchRenderer().equals(JAVA2D) || sketchRenderer().equals(FX2D) || g.isGL())) {
         ThinkDifferent.activateSketchWindow();
       }
 
@@ -261,7 +261,8 @@ public void draw() {
     }
 
     if (frameCount == 1 && platform == LINUX && g.isGL()) {
-      // Linux with KDE Plasma window manager and OpenGL need to capture pixels after the last draw() call
+      // Linux with KDE Plasma window manager and OpenGL need to capture pixels after
+      // the last draw() call
       capturePixels();
     }
   }

py5_resources/py5_module/py5/render_helper.py

@@ -129,15 +129,16 @@ def draw(self):
 def _check_allowed_renderer(renderer):
     renderer_name = {
         Sketch.SVG: "SVG",
+        Sketch.FX2D: "FX2D",
         Sketch.PDF: "PDF",
         Sketch.DXF: "DXF",
         Sketch.P2D: "P2D",
         Sketch.P3D: "P3D",
     }.get(renderer, renderer)
     renderers = (
-        [Sketch.HIDDEN, Sketch.JAVA2D]
+        [Sketch.HIDDEN, Sketch.JAVA2D, Sketch.FX2D]
         if sys.platform == "darwin"
-        else [Sketch.HIDDEN, Sketch.JAVA2D, Sketch.P2D, Sketch.P3D]
+        else [Sketch.HIDDEN, Sketch.JAVA2D, Sketch.FX2D, Sketch.P2D, Sketch.P3D]
     )
     if renderer not in renderers:
         return (

py5_resources/py5_module/py5/test.py

@@ -56,6 +56,11 @@ def test_java2d():
     test.run_sketch()
 
 
+def test_fx2d():
+    test = RendererTest(Sketch.FX2D, "FX2D")
+    test.run_sketch()
+
+
 def test_p2d():
     test = RendererTest(Sketch.P2D, "P2D")
     test.run_sketch()
@@ -91,6 +96,11 @@ def test_interactivity_java2d():
     test.run_sketch()
 
 
+def test_interactivity_fx2d():
+    test = TestInteractivity(Sketch.FX2D, "FX2D")
+    test.run_sketch()
+
+
 def test_interactivity_p2d():
     test = TestInteractivity(Sketch.P2D, "P2D")
     test.run_sketch()

py5_resources/py5_module/py5_tools/imported.py

@@ -223,6 +223,10 @@ def _run_sketch(sketch_path, classpath, exit_if_error):
             jvm.add_jars(sketch_path.parent / "jars")
 
         set_imported_mode(True)
+        try:
+            import py5javafx
+        except ImportError:
+            pass
         import py5
 
         if py5.is_running() if callable(py5.is_running) else py5.is_running:

py5_resources/py5_module/py5_tools/magics/drawing.py

@@ -295,7 +295,7 @@ def py5draw(self, line, cell):
         args = parse_argstring(self.py5draw, line)
 
         if sys.platform == "darwin":
-            if args.renderer in ["P2D", "P3D", "DXF"]:
+            if args.renderer in ["P2D", "P3D", "FX2D", "DXF"]:
                 print(
                     f"Sorry, py5 magics do not support the {args.renderer} renderer on macOS.",
                     file=sys.stderr,
@@ -312,7 +312,7 @@ def py5draw(self, line, cell):
         if args.renderer == "PDF":
             print("please use %%py5drawpdf for PDFs.", file=sys.stderr)
             return
-        if args.renderer not in ["HIDDEN", "JAVA2D", "P2D", "P3D"]:
+        if args.renderer not in ["HIDDEN", "JAVA2D", "P2D", "P3D", "FX2D"]:
             print(f"unknown renderer {args.renderer}", file=sys.stderr)
             return