mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-427_tomnelson_focused_vertex_vs_expand'

Browse Source
This commit is contained in:
ghidravore
2020-11-23 12:47:49 -05:00
parent f0db95c83d ade97ea258
commit 14d4c87ef4
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Ghidra/Features/GraphServices/src/main/java/ghidra/graph/visualization/DefaultGraphDisplay.java
View File

@@ -451,7 +451,7 @@ public class DefaultGraphDisplay implements GraphDisplay {
.popupMenuPath("Expand Selected Vertices") .popupMenuPath("Expand Selected Vertices")
.popupMenuGroup("zz", "6") .popupMenuGroup("zz", "6")
.description("Expands all selected collapsed vertices into their previous form") .description("Expands all selected collapsed vertices into their previous form")
.onAction(c -> graphCollapser.ungroupSelectedVertices()) .onAction(c -> ungroupSelectedVertices())
.buildAndInstallLocal(componentProvider); .buildAndInstallLocal(componentProvider);
togglePopupsAction = new ToggleActionBuilder("Display Popup Windows", ACTION_OWNER) togglePopupsAction = new ToggleActionBuilder("Display Popup Windows", ACTION_OWNER)
@@ -476,6 +476,19 @@ public class DefaultGraphDisplay implements GraphDisplay {
} }
} }
/**
* Ungroup the selected vertices. If the focusedVertex is no longer
* in the graph, null it. This will happen if the focusedVertex was
* the GroupVertex
*/
private void ungroupSelectedVertices() {
graphCollapser.ungroupSelectedVertices();
if (!graph.containsVertex(focusedVertex)) {
focusedVertex = null;
}
}
private void clearSelection() { private void clearSelection() {
viewer.getSelectedVertexState().clear(); viewer.getSelectedVertexState().clear();
viewer.getSelectedEdgeState().clear(); viewer.getSelectedEdgeState().clear();