Merge pull request #358 from Juuxel/flatlaf

Migrate to FlatLaf

5 files changed, 50 insertions, 15 deletions

diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/EnigmaSyntaxKit.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/EnigmaSyntaxKit.java
index 27c866c..b500e4b 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/EnigmaSyntaxKit.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/EnigmaSyntaxKit.java
@@ -7,6 +7,8 @@ import de.sciss.syntaxpane.util.Configuration;
 
 import cuchaz.enigma.gui.config.UiConfig;
 
+import java.awt.Font;
+
 public class EnigmaSyntaxKit extends JavaSyntaxKit {
 
         private static Configuration configuration = null;
@@ -53,7 +55,8 @@ public class EnigmaSyntaxKit extends JavaSyntaxKit {
 
                 configuration.put("Action.quick-find", "cuchaz.enigma.gui.QuickFindAction, menu F");
 
-        configuration.put("DefaultFont", UiConfig.encodeFont(UiConfig.getEditorFont()));
+                Font editorFont = UiConfig.shouldUseCustomFonts() ? UiConfig.getEditorFont() : UiConfig.getFallbackEditorFont();
+                configuration.put("DefaultFont", UiConfig.encodeFont(editorFont));
     }
 
     /**
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/config/LookAndFeel.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/config/LookAndFeel.java
index 1c70d43..e21ef52 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/config/LookAndFeel.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/config/LookAndFeel.java
@@ -8,37 +8,49 @@ import javax.swing.JPanel;
 import javax.swing.UIManager;
 import javax.swing.plaf.metal.MetalLookAndFeel;
 
-import com.bulenkov.darcula.DarculaLaf;
+import com.formdev.flatlaf.FlatDarkLaf;
+import com.formdev.flatlaf.FlatLightLaf;
+import com.formdev.flatlaf.FlatSystemProperties;
+import cuchaz.enigma.gui.util.ScaleUtil;
 
 public enum LookAndFeel {
-        DEFAULT("Default"),
-        DARCULA("Darcula"),
-        SYSTEM("System"),
-        NONE("None (JVM default)");
+        DEFAULT(false),
+        DARCULA(false),
+        METAL(true),
+        SYSTEM(true),
+        NONE(true);
 
         // the "JVM default" look and feel, get it at the beginning and store it so we can set it later
-        private static javax.swing.LookAndFeel NONE_LAF = UIManager.getLookAndFeel();
-        private final String name;
+        private static final javax.swing.LookAndFeel NONE_LAF = UIManager.getLookAndFeel();
+        private final boolean needsScaling;
 
-        LookAndFeel(String name) {
-                this.name = name;
+        LookAndFeel(boolean needsScaling) {
+                this.needsScaling = needsScaling;
         }
 
-        public String getName() {
-                return name;
+        public boolean needsScaling() {
+                // FlatLaf-based LaFs do their own scaling so we don't have to do it.
+                // Running swing-dpi for FlatLaf actually breaks fonts, so we let it scale the GUI.
+                return needsScaling;
         }
 
         public void setGlobalLAF() {
+                // Configure FlatLaf's UI scale to be our scale factor.
+                System.setProperty(FlatSystemProperties.UI_SCALE, Float.toString(ScaleUtil.getScaleFactor()));
+
                 try {
                         switch (this) {
                                 case NONE:
                                         UIManager.setLookAndFeel(NONE_LAF);
                                         break;
                                 case DEFAULT:
+                                        UIManager.setLookAndFeel(new FlatLightLaf());
+                                        break;
+                                case METAL:
                                         UIManager.setLookAndFeel(new MetalLookAndFeel());
                                         break;
                                 case DARCULA:
-                                        UIManager.setLookAndFeel(new DarculaLaf());
+                                        UIManager.setLookAndFeel(new FlatDarkLaf());
                                         break;
                                 case SYSTEM:
                                         UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/config/UiConfig.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/config/UiConfig.java
index 828da11..bab50df 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/config/UiConfig.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/config/UiConfig.java
@@ -220,13 +220,27 @@ public final class UiConfig {
         }
 
         public static Font getEditorFont() {
-                return getFont("Editor").orElseGet(() -> ScaleUtil.scaleFont(Font.decode(Font.MONOSPACED)));
+                return getFont("Editor").orElseGet(UiConfig::getFallbackEditorFont);
         }
 
         public static void setEditorFont(Font font) {
                 setFont("Editor", font);
         }
 
+        /**
+         * Gets the fallback editor font.
+         * It is used
+         * <ul>
+         * <li>when there is no custom editor font chosen</li>
+         * <li>when custom fonts are disabled</li>
+         * </ul>
+         *
+         * @return the fallback editor font
+         */
+        public static Font getFallbackEditorFont() {
+                return ScaleUtil.scaleFont(Font.decode(Font.MONOSPACED));
+        }
+
         public static String encodeFont(Font font) {
                 int style = font.getStyle();
                 String s = style == (Font.BOLD | Font.ITALIC) ? "bolditalic" : style == Font.ITALIC ? "italic" : style == Font.BOLD ? "bold" : "plain";
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/JavadocDialog.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/JavadocDialog.java
index a934d34..8a5a376 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/JavadocDialog.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/JavadocDialog.java
@@ -25,6 +25,7 @@ import com.google.common.base.Strings;
 
 import cuchaz.enigma.analysis.EntryReference;
 import cuchaz.enigma.gui.GuiController;
+import cuchaz.enigma.gui.config.UiConfig;
 import cuchaz.enigma.gui.elements.ValidatableTextArea;
 import cuchaz.enigma.gui.util.GuiUtil;
 import cuchaz.enigma.gui.util.ScaleUtil;
@@ -78,6 +79,7 @@ public class JavadocDialog {
                                 }
                         }
                 });
+                this.text.setFont(UiConfig.shouldUseCustomFonts() ? UiConfig.getEditorFont() : UiConfig.getFallbackEditorFont());
 
                 // buttons panel
                 JPanel buttonsPanel = new JPanel();
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/util/ScaleUtil.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/util/ScaleUtil.java
index 47799fa..78de07d 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/util/ScaleUtil.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/util/ScaleUtil.java
@@ -95,7 +95,11 @@ public class ScaleUtil {
 
         public static void applyScaling() {
                 float scale = getScaleFactor();
-                UiDefaultsScaler.updateAndApplyGlobalScaling((int) (100 * scale), true);
+
+                if (UiConfig.getLookAndFeel().needsScaling()) {
+                        UiDefaultsScaler.updateAndApplyGlobalScaling((int) (100 * scale), true);
+                }
+
                 try {
                         Field defaultFontField = DefaultSyntaxKit.class.getDeclaredField("DEFAULT_FONT");
                         defaultFontField.setAccessible(true);