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

Merge remote-tracking branch

Browse source 
'origin/GT-3116-dragonmacher-edit-data-type-action'
This commit is contained in:
ghidra1 2019-09-06 17:34:52 -04:00
commit e6cbefc706
34 changed files with 946 additions and 1332 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Framework/Docking/src/main/java/docking/ShowComponentAction.java
View file

@ -60,7 +60,6 @@ class ShowComponentAction extends DockingAction
this.info = placeholder;
this.winMgr = winMgr;
this.title = truncateTitleAsNeeded(placeholder.getTitle());
String group = isTransient ? "Transient" : "Permanent";
Icon icon = placeholder.getIcon();
if (icon == null) {
@ -71,7 +70,6 @@ class ShowComponentAction extends DockingAction
setMenuBarData(
new MenuData(new String[] { MENU_WINDOW, subMenuName, placeholder.getFullTitle() },
icon, "Permanent"));
winMgr.doSetMenuGroup(new String[] { MENU_WINDOW, subMenuName }, group);
}
else {
setMenuBarData(new MenuData(new String[] { MENU_WINDOW, title }, icon, "Permanent"));

2
Ghidra/Framework/Docking/src/main/java/docking/action/DockingAction.java
View file

@ -396,7 +396,7 @@ public abstract class DockingAction implements DockingActionIf {
buffer.append(" MENU GROUP: ").append(menuBarData.getMenuGroup());
buffer.append('\n');
String parentGroup = popupMenuData.getParentMenuGroup();
String parentGroup = menuBarData.getParentMenuGroup();
if (parentGroup != null) {
buffer.append(" PARENT GROUP: ").append(parentGroup);
buffer.append('\n');