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

GT-2971 - Key Bindings - test fixes

Browse source
This commit is contained in:
dragonmacher 2019-07-19 12:44:45 -04:00
parent 380d863c96
commit ad4ac0413d
5 changed files with 24 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Ghidra/Framework/Docking/src/main/java/docking/DockableToolBarManager.java
View file

@ -163,10 +163,13 @@ class DockableToolBarManager {
void dispose() {
DockingWindowManager dwm = dockableComponent.getDockingWindowManager();
DockingTool tool = dwm.getTool();
ComponentProvider provider = dockableComponent.getComponentProvider();
tool.removeLocalAction(provider, closeButtonManager.getAction());
// this will be null for non-standard use cases
if (dockableComponent != null) {
DockingWindowManager dwm = dockableComponent.getDockingWindowManager();
DockingTool tool = dwm.getTool();
ComponentProvider provider = dockableComponent.getComponentProvider();
tool.removeLocalAction(provider, closeButtonManager.getAction());
}
headerUpdater.dispose();
menuManager.dispose();
@ -186,6 +189,7 @@ class DockableToolBarManager {
super("Close Window", owner, KeyBindingType.SHARED);
setDescription("Close Window");
setToolBarData(new ToolBarData(CLOSE_ICON, null));
markHelpUnnecessary();
}
@Override