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

Merge remote-tracking branch 'origin/GP-4558_ghidragon_action_chooser_dialog_bugs'

Browse Source
This commit is contained in:
Ryan Kurtz
2024-04-25 09:38:20 -04:00
parent caed8efaf4 6dd517d2d8
commit f9ade82b0a
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Ghidra/Framework/Docking/src/main/java/docking/action/ShowActionChooserDialogAction.java
View File

@@ -46,6 +46,7 @@ public class ShowActionChooserDialogAction extends DockingAction {
Tool tool = DockingWindowManager.getActiveInstance().getTool(); Tool tool = DockingWindowManager.getActiveInstance().getTool();
if (focusedWindow instanceof DockingDialog dialog) { if (focusedWindow instanceof DockingDialog dialog) {
context = dialog.getDialogComponent().getActionContext(null);
showActionsDialog(tool, dialog, context); showActionsDialog(tool, dialog, context);
} }
else if (focusedWindow instanceof DockingFrame dockingFrame) { else if (focusedWindow instanceof DockingFrame dockingFrame) {

4
Ghidra/Framework/Docking/src/main/java/docking/actions/dialog/ActionChooserDialog.java
View File

@@ -63,6 +63,7 @@ public class ActionChooserDialog extends DialogComponentProvider {
"This dialog initialy shows only locally relevant actions. Repeat initial keybinding " + "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" + "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."); " enter to invoke selected action. Type text to filter list.");
setOkEnabled(false);
} }
@Override @Override
@@ -308,7 +309,8 @@ public class ActionChooserDialog extends DialogComponentProvider {
Color fgName = getForeground(); // defaults to list foreground; handles selected state Color fgName = getForeground(); // defaults to list foreground; handles selected state
Color fgKeyBinding = isSelected ? getForeground() : Messages.HINT; 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; fgName = isSelected ? getForeground() : Colors.FOREGROUND_DISABLED;
fgKeyBinding = isSelected ? getForeground() : Colors.FOREGROUND_DISABLED; fgKeyBinding = isSelected ? getForeground() : Colors.FOREGROUND_DISABLED;
disabledText = isSelected ? " <I>disabled</I>" : ""; disabledText = isSelected ? " <I>disabled</I>" : "";