gui: fix results render issues is search dialog

zhangxin8105 · Sep 23, 2015 · 6d963b3 · 6d963b3
1 parent 895ddfa
commit 6d963b3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 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
@@ -157,7 +157,8 @@ public void actionPerformed(ActionEvent event) {
 	}
 
 	protected JPanel initResultsTable() {
-		resultsModel = new ResultsModel();
+		ResultsTableCellRenderer renderer = new ResultsTableCellRenderer();
+		resultsModel = new ResultsModel(renderer);
 		resultsTable = new ResultsTable(resultsModel);
 		resultsTable.setShowHorizontalLines(false);
 		resultsTable.setDragEnabled(false);
@@ -167,7 +168,6 @@ protected JPanel initResultsTable() {
 		resultsTable.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
 		resultsTable.setAutoscrolls(false);
 
-		ResultsTableCellRenderer renderer = new ResultsTableCellRenderer();
 		Enumeration<TableColumn> columns = resultsTable.getColumnModel().getColumns();
 		while (columns.hasMoreElements()) {
 			TableColumn column = columns.nextElement();
@@ -257,8 +257,13 @@ protected static class ResultsModel extends AbstractTableModel {
 		private static final String[] COLUMN_NAMES = {"Node", "Code"};
 
 		private final List<JNode> rows = new ArrayList<JNode>();
+		private final ResultsTableCellRenderer renderer;
 		private boolean addDescColumn;
 
+		public ResultsModel(ResultsTableCellRenderer renderer) {
+			this.renderer = renderer;
+		}
+
 		protected void addAll(Iterable<? extends JNode> nodes) {
 			for (JNode node : nodes) {
 				int size = getRowCount();
@@ -282,6 +287,7 @@ private void add(JNode node) {
 		public void clear() {
 			addDescColumn = false;
 			rows.clear();
+			renderer.clear();
 		}
 
 		public boolean isAddDescColumn() {
@@ -312,11 +318,13 @@ public Object getValueAt(int rowIndex, int columnIndex) {
 	protected class ResultsTableCellRenderer implements TableCellRenderer {
 		private final Color selectedBackground;
 		private final Color selectedForeground;
+		private final Color foreground;
 
 		private Map<Integer, Component> componentCache = new HashMap<Integer, Component>();
 
 		public ResultsTableCellRenderer() {
 			UIDefaults defaults = UIManager.getDefaults();
+			foreground = defaults.getColor("List.foreground");
 			selectedBackground = defaults.getColor("List.selectionBackground");
 			selectedForeground = defaults.getColor("List.selectionForeground");
 		}
@@ -342,6 +350,7 @@ private void updateSelection(Component comp, boolean isSelected) {
 				comp.setForeground(selectedForeground);
 			} else {
 				comp.setBackground(ContentArea.BACKGROUND);
+				comp.setForeground(foreground);
 			}
 		}
 
@@ -372,6 +381,9 @@ protected Component makeCell(JNode node, int column) {
 			return null;
 		}
 
+		public void clear() {
+			componentCache.clear();
+		}
 	}
 
 	private class LoadTask extends SwingWorker<Void, Void> {

diff --git a/jadx-gui/src/main/java/jadx/gui/ui/SearchDialog.java b/jadx-gui/src/main/java/jadx/gui/ui/SearchDialog.java
@@ -81,11 +81,13 @@ private synchronized void performSearch() {
 		resultsModel.clear();
 		String text = searchField.getText();
 		if (text == null || text.isEmpty() || options.isEmpty()) {
+			resultsTable.updateTable();
 			return;
 		}
 		cache.setLastSearch(text);
 		TextSearchIndex index = cache.getTextIndex();
 		if (index == null) {
+			resultsTable.updateTable();
 			return;
 		}
 		if (options.contains(SearchOptions.CLASS)) {