From be509c71043f26c74d41f110eba824fe0c258026 Mon Sep 17 00:00:00 2001 From: Skylot Date: Wed, 23 Jan 2019 10:05:00 +0300 Subject: [PATCH] fix(gui): use editor font in search node column --- .../src/main/java/jadx/gui/ui/CommonSearchDialog.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/jadx-gui/src/main/java/jadx/gui/ui/CommonSearchDialog.java b/jadx-gui/src/main/java/jadx/gui/ui/CommonSearchDialog.java index 4f5b73088..307d6ed80 100644 --- a/jadx-gui/src/main/java/jadx/gui/ui/CommonSearchDialog.java +++ b/jadx-gui/src/main/java/jadx/gui/ui/CommonSearchDialog.java @@ -397,12 +397,14 @@ public abstract class CommonSearchDialog extends JDialog { protected class ResultsTableCellRenderer implements TableCellRenderer { private final JLabel emptyLabel = new JLabel(); + private final Font font; private final Color codeSelectedColor; private final Color codeBackground; private final Map componentCache = new HashMap<>(); public ResultsTableCellRenderer() { RSyntaxTextArea area = CodeArea.getDefaultArea(mainWindow); + this.font = area.getFont(); this.codeSelectedColor = area.getSelectionColor(); this.codeBackground = area.getBackground(); } @@ -414,7 +416,7 @@ public abstract class CommonSearchDialog extends JDialog { Component comp = componentCache.get(id); if (comp == null) { if (obj instanceof JNode) { - comp = makeCell(table, (JNode) obj, column); + comp = makeCell((JNode) obj, column); componentCache.put(id, comp); } else { comp = emptyLabel; @@ -442,10 +444,10 @@ public abstract class CommonSearchDialog extends JDialog { } } - private Component makeCell(JTable table, JNode node, int column) { + private Component makeCell(JNode node, int column) { if (column == 0) { JLabel label = new JLabel(node.makeLongString() + " ", node.getIcon(), SwingConstants.LEFT); - label.setFont(table.getFont()); + label.setFont(font); label.setOpaque(true); label.setToolTipText(label.getText()); return label;