1 files changed, 37 insertions, 29 deletions

diff --git a/src/main/java/cuchaz/enigma/config/Themes.java b/src/main/java/cuchaz/enigma/config/Themes.java
index 753654e..547a420 100644
--- a/src/main/java/cuchaz/enigma/config/Themes.java
+++ b/src/main/java/cuchaz/enigma/config/Themes.java
@@ -1,40 +1,48 @@
 package cuchaz.enigma.config;
 
+import java.awt.Font;
+import java.io.IOException;
+import java.lang.reflect.Field;
+
+import javax.swing.SwingUtilities;
+
+import com.github.swingdpi.UiDefaultsScaler;
 import com.google.common.collect.ImmutableMap;
-import cuchaz.enigma.gui.Gui;
 import cuchaz.enigma.gui.EnigmaSyntaxKit;
+import cuchaz.enigma.gui.Gui;
 import cuchaz.enigma.gui.highlight.BoxHighlightPainter;
 import cuchaz.enigma.gui.highlight.TokenHighlightType;
+import cuchaz.enigma.gui.util.ScaleUtil;
 import de.sciss.syntaxpane.DefaultSyntaxKit;
 
-import javax.swing.*;
-import java.io.IOException;
-
 public class Themes {
 
-    public static void setLookAndFeel(Gui gui, Config.LookAndFeel lookAndFeel) {
-        Config.getInstance().lookAndFeel = lookAndFeel;
-            updateTheme(gui);
-    }
-
-    public static void updateTheme(Gui gui) {
-        Config config = Config.getInstance();
-        config.lookAndFeel.setGlobalLAF();
-        config.lookAndFeel.apply(config);
-        try {
-                config.saveConfig();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        EnigmaSyntaxKit.invalidate();
-        DefaultSyntaxKit.initKit();
-        DefaultSyntaxKit.registerContentType("text/enigma-sources", EnigmaSyntaxKit.class.getName());
-        gui.boxHighlightPainters = ImmutableMap.of(
-                TokenHighlightType.OBFUSCATED, BoxHighlightPainter.create(config.obfuscatedColor, config.obfuscatedColorOutline),
-                TokenHighlightType.PROPOSED, BoxHighlightPainter.create(config.proposedColor, config.proposedColorOutline),
-                TokenHighlightType.DEOBFUSCATED, BoxHighlightPainter.create(config.deobfuscatedColor, config.deobfuscatedColorOutline)
-        );
-        gui.setEditorTheme(config.lookAndFeel);
-        SwingUtilities.updateComponentTreeUI(gui.getFrame());
-    }
+        public static void setLookAndFeel(Gui gui, Config.LookAndFeel lookAndFeel) {
+                Config.getInstance().lookAndFeel = lookAndFeel;
+                updateTheme(gui);
+        }
+
+        public static void updateTheme(Gui gui) {
+                Config config = Config.getInstance();
+                config.lookAndFeel.setGlobalLAF();
+                config.lookAndFeel.apply(config);
+                try {
+                        config.saveConfig();
+                } catch (IOException e) {
+                        e.printStackTrace();
+                }
+                EnigmaSyntaxKit.invalidate();
+                DefaultSyntaxKit.initKit();
+                DefaultSyntaxKit.registerContentType("text/enigma-sources", EnigmaSyntaxKit.class.getName());
+                gui.boxHighlightPainters = ImmutableMap.of(
+                                TokenHighlightType.OBFUSCATED, BoxHighlightPainter.create(config.obfuscatedColor, config.obfuscatedColorOutline),
+                                TokenHighlightType.PROPOSED, BoxHighlightPainter.create(config.proposedColor, config.proposedColorOutline),
+                                TokenHighlightType.DEOBFUSCATED, BoxHighlightPainter.create(config.deobfuscatedColor, config.deobfuscatedColorOutline)
+                );
+                gui.setEditorTheme(config.lookAndFeel);
+                SwingUtilities.updateComponentTreeUI(gui.getFrame());
+                ScaleUtil.applyScaling();
+        }
+
+
 }