yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 17:59:46 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0-dragonmacher-test-fix-4-9-25'

Browse source
This commit is contained in:
Ryan Kurtz 2025-04-09 13:30:21 -04:00
commit 680134df84
1 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Ghidra/Framework/Docking/src/main/java/docking/KeyBindingOverrideKeyEventDispatcher.java
View file

@ -142,6 +142,18 @@ public class KeyBindingOverrideKeyEventDispatcher implements KeyEventDispatcher
return false; return false;
} }
// no actions valid at all
// return
// actions that are valid, but not enabled
// also, is applicable:
// isValidContext();
// is action for active local for provider;
// is focused
// actions that are enabled
KeyBindingPrecedence keyBindingPrecedence = getValidKeyBindingPrecedence(action); KeyBindingPrecedence keyBindingPrecedence = getValidKeyBindingPrecedence(action);
if (keyBindingPrecedence == null) { if (keyBindingPrecedence == null) {
// Note: we used to return false here. Returning false allows Java to handle a given // Note: we used to return false here. Returning false allows Java to handle a given
@ -150,8 +162,9 @@ public class KeyBindingOverrideKeyEventDispatcher implements KeyEventDispatcher
// prevents inconsistent action firing between Ghidra and Java, depending upon // prevents inconsistent action firing between Ghidra and Java, depending upon
// Ghidra's action enablement. If we find a case that is broken by this change, // Ghidra's action enablement. If we find a case that is broken by this change,
// then we will need a more robust solution here. // then we will need a more robust solution here.
action.reportNotEnabled(); // action.reportNotEnabled();
return true; // return true;
return false;
} }
// Process the key event in precedence order. // Process the key event in precedence order.