Merge remote-tracking branch 'origin/GP-4558_ghidragon_action_chooser…

…_dialog_bugs'
squk · Apr 25, 2024 · f9ade82 · f9ade82
2 parents caed8ef + 6dd517d
commit f9ade82
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/action/ShowActionChooserDialogAction.java b/Ghidra/Framework/Docking/src/main/java/docking/action/ShowActionChooserDialogAction.java
@@ -46,6 +46,7 @@ public void actionPerformed(ActionContext context) {
 		Tool tool = DockingWindowManager.getActiveInstance().getTool();
 
 		if (focusedWindow instanceof DockingDialog dialog) {
+			context = dialog.getDialogComponent().getActionContext(null);
 			showActionsDialog(tool, dialog, context);
 		}
 		else if (focusedWindow instanceof DockingFrame dockingFrame) {

diff --git a/Ghidra/Framework/Docking/src/main/java/docking/actions/dialog/ActionChooserDialog.java b/Ghidra/Framework/Docking/src/main/java/docking/actions/dialog/ActionChooserDialog.java
@@ -63,6 +63,7 @@ public ActionChooserDialog(ActionsModel model) {
 			"This dialog initialy shows only locally relevant actions. Repeat initial keybinding " +
 				"to show More. Use up down arrows to scroll through list of actions and press" +
 				" enter to invoke selected action. Type text to filter list.");
+		setOkEnabled(false);
 	}
 
 	@Override
@@ -308,7 +309,8 @@ private String getHtmlText(DockingActionIf action, String category, boolean isSe
 			Color fgName = getForeground(); // defaults to list foreground; handles selected state
 			Color fgKeyBinding = isSelected ? getForeground() : Messages.HINT;
 
-			if (!action.isEnabled()) {
+			ActionContext context = model.getContext();
+			if (!(action.isValidContext(context) && action.isEnabledForContext(context))) {
 				fgName = isSelected ? getForeground() : Colors.FOREGROUND_DISABLED;
 				fgKeyBinding = isSelected ? getForeground() : Colors.FOREGROUND_DISABLED;
 				disabledText = isSelected ? " <I>disabled</I>" : "";