Skip to content

Ghidra is a software reverse engineering (SRE) framework

GP-5070 - Updated the collapse/expand actions in GTree to not be enabled when a filter is applied

dragonmacherbc0733ddbd98
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/GTree.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/GTree.java
index 739efa20ab..2735479d3e 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/GTree.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/tree/GTree.java
@@ -1853,6 +1853,10 @@ public class GTree extends JPanel implements BusyListener {
}
GTree gTree = getTree(context);
+ if (gTree.isFiltered()) {
+ return false;
+ }
+
List<GTreeNode> nodes = gTree.getSelectedNodes();
return !nodes.isEmpty();
}
@@ -1886,6 +1890,10 @@ public class GTree extends JPanel implements BusyListener {
}
GTree gTree = getTree(context);
+ if (gTree.isFiltered()) {
+ return false;
+ }
+
List<GTreeNode> nodes = gTree.getSelectedNodes();
return !nodes.isEmpty();
}
@@ -1908,6 +1916,17 @@ public class GTree extends JPanel implements BusyListener {
GTreeNode root = gTree.getViewRoot();
gTree.collapseAll(root);
}
+
+ @Override
+ public boolean isEnabledForContext(ActionContext context) {
+
+ if (!super.isEnabledForContext(context)) {
+ return false;
+ }
+
+ GTree gTree = getTree(context);
+ return !gTree.isFiltered();
+ }
};
//@formatter:off
collapseTreeAction.setPopupMenuData(new MenuData(
@@ -1925,6 +1944,17 @@ public class GTree extends JPanel implements BusyListener {
GTree gTree = getTree(context);
gTree.expandAll();
}
+
+ @Override
+ public boolean isEnabledForContext(ActionContext context) {
+
+ if (!super.isEnabledForContext(context)) {
+ return false;
+ }
+
+ GTree gTree = getTree(context);
+ return !gTree.isFiltered();
+ }
};
//@formatter:off
expandTreeAction.setPopupMenuData(new MenuData(