JAL-3416 Upgraded FlatLaf to 3.0 and added macOS theme for macOS

diff --git a/j11lib/flatlaf-2.3.jar b/j11lib/flatlaf-2.3.jar
deleted file mode 100644 (file)
index 9f292d2..0000000
Binary files a/j11lib/flatlaf-2.3.jar and /dev/null differ

diff --git a/j11lib/flatlaf-3.0.jar b/j11lib/flatlaf-3.0.jar
new file mode 100644 (file)
index 0000000..75d90d3
Binary files /dev/null and b/j11lib/flatlaf-3.0.jar differ

diff --git a/j11lib/flatlaf-extras-2.3.jar b/j11lib/flatlaf-extras-3.0.jar
similarity index 70%
rename from j11lib/flatlaf-extras-2.3.jar
rename to j11lib/flatlaf-extras-3.0.jar
index 39e9701..1f6bbc3 100644 (file)
Binary files a/j11lib/flatlaf-extras-2.3.jar and b/j11lib/flatlaf-extras-3.0.jar differ

diff --git a/j8lib/flatlaf-2.3.jar b/j8lib/flatlaf-2.3.jar
deleted file mode 100644 (file)
index 9f292d2..0000000
Binary files a/j8lib/flatlaf-2.3.jar and /dev/null differ

diff --git a/j8lib/flatlaf-3.0.jar b/j8lib/flatlaf-3.0.jar
new file mode 100644 (file)
index 0000000..75d90d3
Binary files /dev/null and b/j8lib/flatlaf-3.0.jar differ

diff --git a/j8lib/flatlaf-extras-2.3.jar b/j8lib/flatlaf-extras-3.0.jar
similarity index 70%
rename from j8lib/flatlaf-extras-2.3.jar
rename to j8lib/flatlaf-extras-3.0.jar
index 39e9701..1f6bbc3 100644 (file)
Binary files a/j8lib/flatlaf-extras-2.3.jar and b/j8lib/flatlaf-extras-3.0.jar differ

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index 50c98b4..2fad096 100755 (executable)
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -1124,7 +1124,8 @@ public class Jalview
   private static boolean setFlatLookAndFeel()
   {
     boolean set = setSpecificLookAndFeel("flatlaf light",
-            "com.formdev.flatlaf.FlatLightLaf", false);
+            Platform.isMac() ? "com.formdev.flatlaf.themes.FlatMacLightLaf" :
+              "com.formdev.flatlaf.FlatLightLaf", false);
     if (set)
     {
       if (Platform.isMac())