Merge remote-tracking branch 'origin/patch'

This commit is contained in:
Ryan Kurtz 2022-03-11 02:05:10 -05:00
commit b4216a829f

View file

@ -23,6 +23,7 @@ import javax.swing.JButton;
import docking.ActionContext;
import docking.action.*;
import docking.help.Help;
import docking.widgets.EventTrigger;
import ghidra.util.HelpLocation;
import ghidra.util.Swing;
@ -329,7 +330,7 @@ public abstract class MultiStateDockingAction<T> extends DockingAction {
private final ActionState<T> actionState;
private ActionStateAction(ActionState<T> actionState, boolean isSelected) {
super(actionState.getName(), "multiStateAction");
super(actionState.getName(), "MultiStateAction");
this.actionState = actionState;
setMenuBarData(
@ -338,6 +339,11 @@ public abstract class MultiStateDockingAction<T> extends DockingAction {
if (helpLocation != null) {
setHelpLocation(helpLocation);
}
else {
HelpLocation parentHelp =
Help.getHelpService().getHelpLocation(MultiStateDockingAction.this);
setHelpLocation(parentHelp);
}
}
@Override