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

GP-2768, 2769 - Fixed duplicate drop-down menus; fixed stack trace when

Browse Source 
no drop-down menu was visible
This commit is contained in:
dragonmacher
2022-10-27 16:49:52 -04:00
parent f12b6a52ad
commit 01ec7a3225
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Ghidra/Framework/Docking/src/main/java/docking/DockableToolBarManager.java
View File

@@ -173,6 +173,7 @@ class DockableToolBarManager {
Tool tool = dwm.getTool();
ComponentProvider provider = dockableComponent.getComponentProvider();
tool.removeLocalAction(provider, closeButtonManager.getAction());
tool.removeLocalAction(provider, menuButtonManager.getAction());
}
headerUpdater.dispose();
@@ -253,5 +254,14 @@ class DockableToolBarManager {
popupMenu.addPopupMenuListener(menuManager.getMenuHandler());
popupMenu.show(myButton, 0, d.height);
}
@Override
public boolean isEnabledForContext(ActionContext context) {
if (myButton == null) {
return false; // no menu items; no drop-down menu
}
ComponentProvider provider = context.getComponentProvider();
return provider == dockableComponent.getComponentProvider();
}
}
}