git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fd4703a
)
JAL-3608 also look at user pref PREFERRED_LAF
author
Ben Soares
<bsoares@dundee.ac.uk>
Sun, 3 May 2020 19:12:41 +0000
(20:12 +0100)
committer
Ben Soares
<bsoares@dundee.ac.uk>
Sun, 3 May 2020 19:12:41 +0000
(20:12 +0100)
src/jalview/bin/Jalview.java
patch
|
blob
|
history
diff --git
a/src/jalview/bin/Jalview.java
b/src/jalview/bin/Jalview.java
index
992ca01
..
64e3d81
100755
(executable)
--- 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.
// 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)
{
boolean lafSet = false;
switch (laf)
{