Fix: Preset dialogs not appearing on MacOS #131

SonarSonic · Apr 12, 2024 · a42104f · a42104f
1 parent 68c0022
commit a42104f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 0 deletions.
diff --git a/src/main/java/drawingbot/javafx/FXHelper.java b/src/main/java/drawingbot/javafx/FXHelper.java
@@ -403,6 +403,7 @@ public static void openFolder(File directory){
     public static void initSeparateStageWithController(String fmxlPath, Stage stage, Object controller, String stageTitle, Modality modality){
         try {
             FXMLLoader exportUILoader = new FXMLLoader(FXController.class.getResource(fmxlPath));
+            exportUILoader.setClassLoader(FXController.class.getClassLoader());
             exportUILoader.setController(controller);
             initSeparateStageProps(exportUILoader.load(), stage, stageTitle, modality);
         } catch (IOException e) {
@@ -413,6 +414,7 @@ public static void initSeparateStageWithController(String fmxlPath, Stage stage,
     public static <T> T initSeparateStage(String fmxlPath, Stage stage, String stageTitle, Modality modality){
         try {
             FXMLLoader exportUILoader = new FXMLLoader(FXController.class.getResource(fmxlPath));
+            exportUILoader.setClassLoader(FXController.class.getClassLoader());
             Parent root = exportUILoader.load();
             T controller = exportUILoader.getController();
             exportUILoader.setController(controller);

diff --git a/src/main/java/drawingbot/javafx/controls/ControlDrawingSetEditor.java b/src/main/java/drawingbot/javafx/controls/ControlDrawingSetEditor.java
@@ -59,6 +59,7 @@ public class ControlDrawingSetEditor extends VBox {
 
     public ControlDrawingSetEditor() {
         FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("drawingseteditor.fxml"));
+        fxmlLoader.setClassLoader(getClass().getClassLoader());
         fxmlLoader.setRoot(this);
         fxmlLoader.setControllerFactory(c -> this);
 

diff --git a/src/main/java/drawingbot/javafx/controls/ControlImageFiltersEditor.java b/src/main/java/drawingbot/javafx/controls/ControlImageFiltersEditor.java
@@ -46,6 +46,7 @@ public class ControlImageFiltersEditor extends VBox {
 
     public ControlImageFiltersEditor() {
         FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("imagefilterseditor.fxml"));
+        fxmlLoader.setClassLoader(getClass().getClassLoader());
         fxmlLoader.setRoot(this);
         fxmlLoader.setControllerFactory(c -> this);
 

diff --git a/src/main/java/drawingbot/javafx/controls/ControlPFMSettingsEditor.java b/src/main/java/drawingbot/javafx/controls/ControlPFMSettingsEditor.java
@@ -52,6 +52,7 @@ public class ControlPFMSettingsEditor extends VBox implements ISpecialListenable
 
     public ControlPFMSettingsEditor() {
         FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("pfmsettingseditor.fxml"));
+        fxmlLoader.setClassLoader(getClass().getClassLoader());
         fxmlLoader.setRoot(this);
         fxmlLoader.setControllerFactory(c -> this);
 

diff --git a/src/main/java/drawingbot/javafx/preferences/items/ControllerNode.java b/src/main/java/drawingbot/javafx/preferences/items/ControllerNode.java
@@ -36,6 +36,7 @@ public Node getContent() {
         if(root == null && !loadFailed){
             try {
                 FXMLLoader fxmlLoader = new FXMLLoader(ControllerNode.class.getResource(fxmlPath));
+                fxmlLoader.setClassLoader(getClass().getClassLoader());
                 root = fxmlLoader.load();
                 controller = fxmlLoader.getController();
                 fxmlLoader.setController(controller);