From 2d6e2972a4d24b83bbc5d94286204f06c319b16b Mon Sep 17 00:00:00 2001 From: ix0rai Date: Sun, 21 Jan 2024 22:53:36 -0600 Subject: [PATCH] maybe this will be the fix? --- .../org/quiltmc/enigma/gui/config/theme/Themes.java | 2 +- .../quiltmc/enigma/gui/element/EditorTabbedPane.java | 1 - .../quiltmc/enigma/gui/event/ThemeChangeListener.java | 11 ----------- 3 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 enigma-swing/src/main/java/org/quiltmc/enigma/gui/event/ThemeChangeListener.java diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/config/theme/Themes.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/config/theme/Themes.java index d44772fb9..760b66342 100644 --- a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/config/theme/Themes.java +++ b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/config/theme/Themes.java @@ -19,11 +19,11 @@ public static void setupTheme() { Config.activeLookAndFeel = laf; laf.setGlobalLAF(); Config.currentColors().configure(LookAndFeel.isDarkLaf()); + Config.updateSyntaxpain(); Themes.setFonts(); UIManager.put("ScrollBar.showButtons", true); JEditorPane.registerEditorKitForContentType("text/enigma-sources", JavaSyntaxKit.class.getName()); ScaleUtil.applyScaling(); - Config.updateSyntaxpain(); } private static void setFonts() { diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/EditorTabbedPane.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/EditorTabbedPane.java index a25fbbf79..7c491659f 100644 --- a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/EditorTabbedPane.java +++ b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/EditorTabbedPane.java @@ -43,7 +43,6 @@ public EditorPanel openClass(ClassEntry entry) { if (ch == null) return null; this.navigator = new NavigatorPanel(this.gui); EditorPanel ed = new EditorPanel(this.gui, this.navigator); - ed.getEditor().updateUI(); ed.setClassHandle(ch); this.openFiles.addTab(ed.getFileName(), ed.getUi()); diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/event/ThemeChangeListener.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/event/ThemeChangeListener.java deleted file mode 100644 index bc6bbcd4b..000000000 --- a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/event/ThemeChangeListener.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.quiltmc.enigma.gui.event; - -import org.quiltmc.enigma.gui.config.theme.LookAndFeel; -import org.quiltmc.enigma.gui.highlight.BoxHighlightPainter; -import org.quiltmc.enigma.api.source.TokenType; - -import java.util.Map; - -public interface ThemeChangeListener { - void onThemeChanged(LookAndFeel lookAndFeel, Map boxHighlightPainters); -}