From e5be41b9cc47e69f4826915bc2a686172c7b6558 Mon Sep 17 00:00:00 2001
From: Skylot <118523+skylot@users.noreply.github.com>
Date: Tue, 22 Oct 2024 21:29:00 +0100
Subject: [PATCH] fix(gui): use another implementation for font dialog (#2310)

---
 jadx-gui/build.gradle.kts                     |   2 +-
 jadx-gui/libs/jfontchooser-1.0.5.jar          | Bin 16703 -> 0 bytes
 .../settings/ui/JPreferredFontChooser.java    |  52 -----------
 .../gui/settings/ui/JadxSettingsWindow.java   |  19 ++--
 .../gui/settings/ui/font/FontChooserHack.java |  31 +++++++
 .../gui/settings/ui/font/JadxFontDialog.java  |  86 ++++++++++++++++++
 6 files changed, 125 insertions(+), 65 deletions(-)
 delete mode 100644 jadx-gui/libs/jfontchooser-1.0.5.jar
 delete mode 100644 jadx-gui/src/main/java/jadx/gui/settings/ui/JPreferredFontChooser.java
 create mode 100644 jadx-gui/src/main/java/jadx/gui/settings/ui/font/FontChooserHack.java
 create mode 100644 jadx-gui/src/main/java/jadx/gui/settings/ui/font/JadxFontDialog.java

diff --git a/jadx-gui/build.gradle.kts b/jadx-gui/build.gradle.kts
index eaeaa05df..5931e54b0 100644
--- a/jadx-gui/build.gradle.kts
+++ b/jadx-gui/build.gradle.kts
@@ -31,7 +31,7 @@ dependencies {
 	implementation("io.github.oshai:kotlin-logging-jvm:7.0.0")
 
 	implementation("com.fifesoft:rsyntaxtextarea:3.4.1")
-	implementation(files("libs/jfontchooser-1.0.5.jar"))
+	implementation("org.drjekyll:fontchooser:3.1.0")
 	implementation("hu.kazocsaba:image-viewer:1.2.3")
 
 	implementation("com.formdev:flatlaf:3.5.1")
diff --git a/jadx-gui/libs/jfontchooser-1.0.5.jar b/jadx-gui/libs/jfontchooser-1.0.5.jar
deleted file mode 100644
index 3a9779f592ddeed0e043f0aaa9e00e9eccddabfd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16703
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
HIQ#zqOiT?F

diff --git a/jadx-gui/src/main/java/jadx/gui/settings/ui/JPreferredFontChooser.java b/jadx-gui/src/main/java/jadx/gui/settings/ui/JPreferredFontChooser.java
deleted file mode 100644
index 785b4465b..000000000
--- a/jadx-gui/src/main/java/jadx/gui/settings/ui/JPreferredFontChooser.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package jadx.gui.settings.ui;
-
-import java.awt.GraphicsEnvironment;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import say.swing.JFontChooser;
-
-public class JPreferredFontChooser extends JFontChooser {
-	private static final Logger LOG = LoggerFactory.getLogger(JPreferredFontChooser.class);
-
-	private static final String[] PREFERRED_FONTS = new String[] {
-			"Monospaced", "Consolas", "Courier", "Courier New",
-			"Lucida Sans Typewriter", "Lucida Console",
-			"SimSun", "SimHei",
-	};
-
-	private String[] filteredFonts;
-
-	@Override
-	protected String[] getFontFamilies() {
-		if (filteredFonts == null) {
-			GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment();
-			Set<String> fontSet = new HashSet<>();
-			Collections.addAll(fontSet, env.getAvailableFontFamilyNames());
-			List<String> found = new ArrayList<>(PREFERRED_FONTS.length);
-			for (String font : PREFERRED_FONTS) {
-				if (fontSet.contains(font)) {
-					found.add(font);
-				}
-			}
-			if (found.size() == PREFERRED_FONTS.length) {
-				filteredFonts = PREFERRED_FONTS;
-			} else if (found.size() > 0) {
-				filteredFonts = new String[found.size()];
-				for (int i = 0; i < found.size(); i++) {
-					filteredFonts[i] = found.get(i);
-				}
-			} else {
-				LOG.warn("Can't found any preferred fonts for smali, use all available.");
-				filteredFonts = env.getAvailableFontFamilyNames();
-			}
-		}
-		return filteredFonts;
-	}
-}
diff --git a/jadx-gui/src/main/java/jadx/gui/settings/ui/JadxSettingsWindow.java b/jadx-gui/src/main/java/jadx/gui/settings/ui/JadxSettingsWindow.java
index 38928c683..96adbc040 100644
--- a/jadx-gui/src/main/java/jadx/gui/settings/ui/JadxSettingsWindow.java
+++ b/jadx-gui/src/main/java/jadx/gui/settings/ui/JadxSettingsWindow.java
@@ -44,8 +44,6 @@ import org.slf4j.LoggerFactory;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
 
-import say.swing.JFontChooser;
-
 import jadx.api.CommentsLevel;
 import jadx.api.DecompilationMode;
 import jadx.api.JadxArgs;
@@ -63,6 +61,7 @@ import jadx.gui.settings.JadxUpdateChannel;
 import jadx.gui.settings.LineNumbersMode;
 import jadx.gui.settings.XposedCodegenLanguage;
 import jadx.gui.settings.ui.cache.CacheSettingsGroup;
+import jadx.gui.settings.ui.font.JadxFontDialog;
 import jadx.gui.settings.ui.plugins.PluginSettings;
 import jadx.gui.settings.ui.shortcut.ShortcutsSettingsGroup;
 import jadx.gui.ui.MainWindow;
@@ -371,11 +370,9 @@ public class JadxSettingsWindow extends JDialog {
 		fontBtn.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent e) {
-				JFontChooser fontChooser = new JFontChooser();
-				fontChooser.setSelectedFont(settings.getFont());
-				int result = fontChooser.showDialog(JadxSettingsWindow.this);
-				if (result == JFontChooser.OK_OPTION) {
-					Font font = fontChooser.getSelectedFont();
+				Font font = new JadxFontDialog(JadxSettingsWindow.this, NLS.str("preferences.font"))
+						.select(settings.getFont(), false);
+				if (font != null) {
 					LOG.debug("Selected Font: {}", font);
 					settings.setFont(font);
 					mainWindow.loadSettings();
@@ -387,11 +384,9 @@ public class JadxSettingsWindow extends JDialog {
 		smaliFontBtn.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent e) {
-				JFontChooser fontChooser = new JPreferredFontChooser();
-				fontChooser.setSelectedFont(settings.getSmaliFont());
-				int result = fontChooser.showDialog(JadxSettingsWindow.this);
-				if (result == JFontChooser.OK_OPTION) {
-					Font font = fontChooser.getSelectedFont();
+				Font font = new JadxFontDialog(JadxSettingsWindow.this, NLS.str("preferences.smali_font"))
+						.select(settings.getSmaliFont(), true);
+				if (font != null) {
 					LOG.debug("Selected Font: {} for smali", font);
 					settings.setSmaliFont(font);
 					mainWindow.loadSettings();
diff --git a/jadx-gui/src/main/java/jadx/gui/settings/ui/font/FontChooserHack.java b/jadx-gui/src/main/java/jadx/gui/settings/ui/font/FontChooserHack.java
new file mode 100644
index 000000000..fd496104b
--- /dev/null
+++ b/jadx-gui/src/main/java/jadx/gui/settings/ui/font/FontChooserHack.java
@@ -0,0 +1,31 @@
+package jadx.gui.settings.ui.font;
+
+import java.lang.reflect.Field;
+
+import javax.swing.JCheckBox;
+
+import org.drjekyll.fontchooser.FontChooser;
+import org.drjekyll.fontchooser.panes.FamilyPane;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class FontChooserHack {
+	private static final Logger LOG = LoggerFactory.getLogger(FontChooserHack.class);
+
+	public static void setOnlyMonospace(FontChooser fontChooser) {
+		try {
+			FamilyPane familyPane = (FamilyPane) getPrivateField(fontChooser, "familyPane");
+			JCheckBox monospacedCheckBox = (JCheckBox) getPrivateField(familyPane, "monospacedCheckBox");
+			monospacedCheckBox.setSelected(true);
+			monospacedCheckBox.setEnabled(false);
+		} catch (Throwable e) {
+			LOG.debug("Failed to set only monospace check box", e);
+		}
+	}
+
+	private static Object getPrivateField(Object obj, String fieldName) throws NoSuchFieldException, IllegalAccessException {
+		Field f = obj.getClass().getDeclaredField(fieldName);
+		f.setAccessible(true);
+		return f.get(obj);
+	}
+}
diff --git a/jadx-gui/src/main/java/jadx/gui/settings/ui/font/JadxFontDialog.java b/jadx-gui/src/main/java/jadx/gui/settings/ui/font/JadxFontDialog.java
new file mode 100644
index 000000000..207496549
--- /dev/null
+++ b/jadx-gui/src/main/java/jadx/gui/settings/ui/font/JadxFontDialog.java
@@ -0,0 +1,86 @@
+package jadx.gui.settings.ui.font;
+
+import java.awt.BorderLayout;
+import java.awt.FlowLayout;
+import java.awt.Font;
+
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+import javax.swing.WindowConstants;
+
+import org.drjekyll.fontchooser.FontChooser;
+import org.jetbrains.annotations.Nullable;
+
+import jadx.gui.settings.JadxSettings;
+import jadx.gui.settings.ui.JadxSettingsWindow;
+import jadx.gui.utils.NLS;
+
+public class JadxFontDialog extends JDialog {
+	private static final long serialVersionUID = 7609857698785777587L;
+
+	private final FontChooser fontChooser = new FontChooser();
+	private final JadxSettings settings;
+	private boolean selected = false;
+
+	public JadxFontDialog(JadxSettingsWindow settingsWindow, String title) {
+		super(settingsWindow, title, true);
+		settings = settingsWindow.getMainWindow().getSettings();
+		initComponents();
+		setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+		if (!settings.loadWindowPos(this)) {
+			pack();
+		}
+	}
+
+	public @Nullable Font select(Font currentFont, boolean onlyMonospace) {
+		fontChooser.setSelectedFont(currentFont);
+		if (onlyMonospace) {
+			FontChooserHack.setOnlyMonospace(fontChooser);
+		}
+		setVisible(true);
+		Font selectedFont = fontChooser.getSelectedFont();
+		if (selected && !selectedFont.equals(currentFont)) {
+			return selectedFont;
+		}
+		return null;
+	}
+
+	private void initComponents() {
+		JPanel chooserPanel = new JPanel();
+		chooserPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 0, 10));
+		chooserPanel.setLayout(new BorderLayout(0, 10));
+		chooserPanel.add(fontChooser);
+
+		JPanel controlPanel = new JPanel();
+		controlPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
+		controlPanel.setLayout(new FlowLayout(FlowLayout.TRAILING));
+
+		JButton okBtn = new JButton();
+		okBtn.setText(NLS.str("common_dialog.ok"));
+		okBtn.setMnemonic('o');
+		okBtn.addActionListener(event -> {
+			selected = true;
+			dispose();
+		});
+
+		JButton cancelBtn = new JButton();
+		cancelBtn.setText(NLS.str("common_dialog.cancel"));
+		cancelBtn.setMnemonic('c');
+		cancelBtn.addActionListener(event -> dispose());
+
+		controlPanel.add(okBtn);
+		controlPanel.add(cancelBtn);
+
+		add(chooserPanel);
+		add(controlPanel, BorderLayout.PAGE_END);
+		getRootPane().setDefaultButton(okBtn);
+	}
+
+	@Override
+	public void dispose() {
+		settings.saveWindowPos(this);
+		super.dispose();
+	}
+}