Set macos options before AWT loads so it gets set correctly

elliotjarnit · Nov 22, 2023 · da2a7cf · da2a7cf
1 parent df71664
commit da2a7cf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/main/java/dev/elliotjarnit/elliotengine/ElliotEngine.java b/src/main/java/dev/elliotjarnit/elliotengine/ElliotEngine.java
@@ -49,6 +49,12 @@ public void run() {
         if (!isSetup) {
             this.optionSetup();
 
+            // Mac OS X specific options
+            if (this.getPlatform() == ElliotEngine.Platform.MAC) {
+                System.setProperty("apple.laf.useScreenMenuBar", "true");
+                System.setProperty("apple.awt.application.name", this.getOption(ElliotEngine.Options.NAME));
+            }
+
             // Setup renderer
             renderer = new RenderingEngine(this);
             // Setup window

diff --git a/src/main/java/dev/elliotjarnit/elliotengine/Window/WindowManager.java b/src/main/java/dev/elliotjarnit/elliotengine/Window/WindowManager.java
@@ -28,11 +28,6 @@ public void setup() {
         Container pane = window.getContentPane();
         pane.setLayout(new BorderLayout());
         pane.add(renderingEngine, BorderLayout.CENTER);
-
-        if (this.engine.getPlatform() == ElliotEngine.Platform.MAC) {
-            System.setProperty("apple.laf.useScreenMenuBar", "true");
-            System.setProperty("apple.awt.application.name", this.engine.getOption(ElliotEngine.Options.NAME));
-        }
     }
 
     public void start() {