Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

add a search bar to the structure panel #266

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import org.quiltmc.enigma.api.analysis.tree.StructureTreeNode;
import org.quiltmc.enigma.api.analysis.tree.StructureTreeOptions;
import org.quiltmc.enigma.gui.Gui;
import org.quiltmc.enigma.gui.config.Config;
import org.quiltmc.enigma.gui.panel.EditorPanel;
import org.quiltmc.enigma.gui.config.keybind.KeyBinds;
import org.quiltmc.enigma.gui.renderer.StructureOptionListCellRenderer;
Expand All @@ -19,13 +20,16 @@
import java.awt.Component;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
import javax.swing.JComboBox;
import javax.swing.JPanel;
import javax.swing.JLabel;
import javax.swing.JScrollPane;
import javax.swing.JTextArea;
import javax.swing.JTree;
import javax.swing.border.LineBorder;
import javax.swing.tree.DefaultTreeCellRenderer;
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreeNode;
Expand All @@ -34,10 +38,12 @@
public class StructureDocker extends Docker {
private final JPanel optionsPanel;

private final JLabel searchLabel = new JLabel();
private final JLabel obfuscationVisibilityLabel = new JLabel();
private final JLabel documentationVisibilityLabel = new JLabel();
private final JLabel sortingOrderLabel = new JLabel();

private final JTextArea searchBar;
private final JComboBox<StructureTreeOptions.ObfuscationVisibility> obfuscationVisibility;
private final JComboBox<StructureTreeOptions.DocumentationVisibility> documentationVisibility;
private final JComboBox<StructureTreeOptions.SortingOrder> sortingOrder;
Expand All @@ -51,23 +57,35 @@ public StructureDocker(Gui gui) {

GridBagConstraintsBuilder cb = GridBagConstraintsBuilder.create().insets(5).fill(GridBagConstraints.HORIZONTAL);

this.optionsPanel.add(this.obfuscationVisibilityLabel, cb.pos(0, 0).build());
this.optionsPanel.add(this.searchLabel, cb.pos(0, 0).build());
this.searchBar = new JTextArea();
this.searchBar.setBorder(new LineBorder(Config.currentTheme().getSyntaxPaneColors().delimiter.value()));
this.searchBar.addKeyListener(new KeyAdapter() {
@Override
public void keyReleased(KeyEvent e) {
super.keyTyped(e);
StructureDocker.this.updateStructure(gui.getActiveEditor());
}
});
this.optionsPanel.add(this.searchBar, cb.pos(1, 0).build());

this.optionsPanel.add(this.obfuscationVisibilityLabel, cb.pos(0, 1).build());
this.obfuscationVisibility = new JComboBox<>(StructureTreeOptions.ObfuscationVisibility.values());
this.obfuscationVisibility.setRenderer(new StructureOptionListCellRenderer());
this.obfuscationVisibility.addActionListener(event -> this.updateStructure(gui.getActiveEditor()));
this.optionsPanel.add(this.obfuscationVisibility, cb.pos(1, 0).build());
this.optionsPanel.add(this.obfuscationVisibility, cb.pos(1, 1).build());

this.optionsPanel.add(this.documentationVisibilityLabel, cb.pos(0, 1).build());
this.optionsPanel.add(this.documentationVisibilityLabel, cb.pos(0, 2).build());
this.documentationVisibility = new JComboBox<>(StructureTreeOptions.DocumentationVisibility.values());
this.documentationVisibility.setRenderer(new StructureOptionListCellRenderer());
this.documentationVisibility.addActionListener(event -> this.updateStructure(gui.getActiveEditor()));
this.optionsPanel.add(this.documentationVisibility, cb.pos(1, 1).build());
this.optionsPanel.add(this.documentationVisibility, cb.pos(1, 2).build());

this.optionsPanel.add(this.sortingOrderLabel, cb.pos(0, 2).build());
this.optionsPanel.add(this.sortingOrderLabel, cb.pos(0, 3).build());
this.sortingOrder = new JComboBox<>(StructureTreeOptions.SortingOrder.values());
this.sortingOrder.setRenderer(new StructureOptionListCellRenderer());
this.sortingOrder.addActionListener(event -> this.updateStructure(gui.getActiveEditor()));
this.optionsPanel.add(this.sortingOrder, cb.pos(1, 2).build());
this.optionsPanel.add(this.sortingOrder, cb.pos(1, 3).build());

this.structureTree = new JTree();
this.structureTree.setModel(null);
Expand Down Expand Up @@ -143,13 +161,15 @@ private StructureTreeOptions getOptions() {
return new StructureTreeOptions(
(StructureTreeOptions.ObfuscationVisibility) this.obfuscationVisibility.getSelectedItem(),
(StructureTreeOptions.DocumentationVisibility) this.documentationVisibility.getSelectedItem(),
(StructureTreeOptions.SortingOrder) this.sortingOrder.getSelectedItem()
(StructureTreeOptions.SortingOrder) this.sortingOrder.getSelectedItem(),
this.searchBar.getText()
);
}

@Override
public void retranslateUi() {
super.retranslateUi();
this.searchLabel.setText(I18n.translate("menu.search"));
this.obfuscationVisibilityLabel.setText(I18n.translate("structure.options.obfuscation"));
this.documentationVisibilityLabel.setText(I18n.translate("structure.options.documentation"));
this.sortingOrderLabel.setText(I18n.translate("structure.options.sorting"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,10 @@ public void load(EnigmaProject project, StructureTreeOptions options) {
childNode.load(project, options);
}

this.add(childNode);
String search = options.searchString().strip().toLowerCase();
if ((child instanceof ClassEntry) || (search.isBlank() || childNode.toString().toLowerCase().contains(search))) {
this.add(childNode);
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
public record StructureTreeOptions(
ObfuscationVisibility obfuscationVisibility,
DocumentationVisibility documentationVisibility,
SortingOrder sortingOrder) {
SortingOrder sortingOrder,
String searchString) {
public enum ObfuscationVisibility implements Option {
ALL("structure.options.obfuscation.all"),
OBFUSCATED("structure.options.obfuscation.obfuscated"),
Expand Down