yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-06 03:50:02 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch

Browse source 
'origin/GP-1852_d-millar_refresh_issues--SQUASHED' (Closes #4059)
This commit is contained in:
Ryan Kurtz 2022-03-25 02:02:33 -04:00
commit 3755d5c02d
3 changed files with 29 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/components/ObjectTree.java
View file

@ -105,7 +105,13 @@ public class ObjectTree implements ObjectPane {
}
}
currentSelectionPaths = selectionPaths;
currentExpandedPaths = tree.getExpandedPaths();
List<TreePath> paths = tree.getExpandedPaths();
if (currentExpandedPaths == null) {
currentExpandedPaths = paths;
}
else if (paths != null && (paths.size() >= currentExpandedPaths.size())) {
currentExpandedPaths = paths;
}
currentViewPosition = tree.getViewPosition();
restoreTreeStateManager.updateLater();
}
@ -133,6 +139,7 @@ public class ObjectTree implements ObjectPane {
if (!node.isExpanded()) {
//currentExpandedPaths = tree.getExpandedPaths();
node.markExpanded();
currentExpandedPaths = tree.getExpandedPaths();
}
}
}
@ -146,6 +153,7 @@ public class ObjectTree implements ObjectPane {
if (node.isExpanded()) {
//currentExpandedPaths = tree.getExpandedPaths();
node.markCollapsed();
currentExpandedPaths = tree.getExpandedPaths();
}
}
}