From 667e069bcce4c378a4a46dfb0a569038436269bb Mon Sep 17 00:00:00 2001
From: Fabian Becker <halfdan@xnorfz.de>
Date: Sat, 15 Nov 2014 06:38:10 +0100
Subject: [PATCH] Initialize Look and Feel seperately.

---
 src/eva2/gui/Main.java | 74 +++++++++++++++++++++++-------------------
 1 file changed, 40 insertions(+), 34 deletions(-)

diff --git a/src/eva2/gui/Main.java b/src/eva2/gui/Main.java
index 6ca41589..d216a25d 100644
--- a/src/eva2/gui/Main.java
+++ b/src/eva2/gui/Main.java
@@ -201,7 +201,7 @@ public class Main extends JFrame implements OptimizationStateListener {
 
         this.comAdapter = EvAComAdapter.getInstance();
         splashScreenTime = 2500;
-        SwingUtilities.invokeLater(initRunnable = new Runnable() {
+        initRunnable = new Runnable() {
 
             @Override
             public void run() {
@@ -219,7 +219,7 @@ public class Main extends JFrame implements OptimizationStateListener {
                                 if (wait < splashScreenTime) {
                                     Thread.sleep(splashScreenTime - wait);
                                 }
-                            } catch (Exception e) {
+                            } catch (Exception ignored) {
                             }
                         }
                     } else {
@@ -242,7 +242,41 @@ public class Main extends JFrame implements OptimizationStateListener {
                     notifyAll();
                 }
             }
-        });
+        };
+        SwingUtilities.invokeLater(initRunnable);
+    }
+
+    private void initLookAndFeel() {
+        // Properties for Mac OS X support.
+        if ((System.getProperty("mrj.version") != null)
+                || (System.getProperty("os.name").toLowerCase().contains("mac"))) {
+            /*
+             * Note: the xDock name property must be set before parsing
+             * command-line arguments! See above!
+             */
+            System.setProperty("com.apple.mrj.application.apple.menu.about.name", EvAInfo.productName);
+
+            System.setProperty("apple.awt.graphics.EnableQ2DX", "true");
+            System.setProperty("apple.laf.useScreenMenuBar", "true");
+            System.setProperty("com.apple.macos.smallTabs", "true");
+            System.setProperty("com.apple.macos.useScreenMenuBar", "true");
+
+            System.setProperty("com.apple.mrj.application.growbox.intrudes", "false");
+            System.setProperty("com.apple.mrj.application.live-resize", "true");
+            try {
+                UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+            } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | UnsupportedLookAndFeelException ex) {
+                LOGGER.log(Level.INFO, "Could not set Look&Feel", ex);
+            }
+        } else {
+            /* Set Look and Feel */
+            try {
+                UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+                //UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
+            } catch (Exception ex) {
+                LOGGER.log(Level.INFO, "Could not set Look&Feel", ex);
+            }
+        }
     }
 
     /**
@@ -321,6 +355,9 @@ public class Main extends JFrame implements OptimizationStateListener {
         }
 
         if (withGUI) {
+            // Initialize look and feel for EvA2
+            initLookAndFeel();
+
             GridBagConstraints gbConstraints = new GridBagConstraints();
 
             /* Create main frame with GridBagLayout */
@@ -511,37 +548,6 @@ public class Main extends JFrame implements OptimizationStateListener {
      * @param args command line parameters
      */
     public static void main(String[] args) {
-        // Properties for Mac OS X support.
-        if ((System.getProperty("mrj.version") != null)
-                || (System.getProperty("os.name").toLowerCase().contains("mac"))) {
-            /*
-             * Note: the xDock name property must be set before parsing
-             * command-line arguments! See above!
-             */
-            System.setProperty("com.apple.mrj.application.apple.menu.about.name", EvAInfo.productName);
-
-            System.setProperty("apple.awt.graphics.EnableQ2DX", "true");
-            System.setProperty("apple.laf.useScreenMenuBar", "true");
-            System.setProperty("com.apple.macos.smallTabs", "true");
-            System.setProperty("com.apple.macos.useScreenMenuBar", "true");
-
-            System.setProperty("com.apple.mrj.application.growbox.intrudes", "false");
-            System.setProperty("com.apple.mrj.application.live-resize", "true");
-            try {
-                UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-            } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | UnsupportedLookAndFeelException ex) {
-                LOGGER.log(Level.INFO, "Could not set Look&Feel", ex);
-            }
-        } else {
-            /* Set Look and Feel */
-            try {
-                UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-                //UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
-            } catch (Exception ex) {
-                LOGGER.log(Level.INFO, "Could not set Look&Feel", ex);
-            }
-        }
-
         /* Available command-line parameters */
         String[] keys = new String[]{
             "--help", "--autorun", "--nosplash", "--nogui", "--params", "--treeView"