From: Ben Soares <bsoares@dundee.ac.uk>
Date: Sun, 3 May 2020 19:12:41 +0000 (+0100)
Subject: JAL-3608 also look at user pref PREFERRED_LAF
X-Git-Tag: Develop-2_11_2_0-d20201215~24^2~16^2^2~2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=0ddc96bc043a4fe9ba9b2947a770ae1d3969079c;p=jalview.git

JAL-3608 also look at user pref PREFERRED_LAF
---

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index 992ca01..64e3d81 100755
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -371,7 +371,14 @@ public class Jalview
     // property laf = "crossplatform", "system", "gtk", "metal" or "mac"
     // If not set (or chosen laf fails), use the normal SystemLaF and if on Mac,
     // try Quaqua/Vaqua.
-    String laf = System.getProperty("laf", "none");
+    String lafProp = System.getProperty("laf");
+    String lafSetting = Cache.getDefault("PREFERRED_LAF", null);
+    String laf = "none";
+    if (lafProp != null) {
+    	laf = lafProp;
+    } else if (lafSetting != null) {
+    	laf = lafSetting;
+    }
     boolean lafSet = false;
     switch (laf)
     {