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

GP-5313 - Fixed the Escape key not working inside of cell editors when

Browse source 
it is also bound to a global action
This commit is contained in:
dragonmacher 2025-01-25 11:04:47 -05:00
parent 1dfad28eee
commit 4432329479
1 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -281,7 +281,7 @@ public class KeyBindingOverrideKeyEventDispatcher implements KeyEventDispatcher
destination = focusOwner; destination = focusOwner;
} }
if (!(destination instanceof JTextComponent)) { if (!(destination instanceof JTextComponent textComponent)) {
return false; // we only handle text components return false; // we only handle text components
} }
@ -299,7 +299,9 @@ public class KeyBindingOverrideKeyEventDispatcher implements KeyEventDispatcher
// widgets register actions for Escape and then check for that action. // widgets register actions for Escape and then check for that action.
int code = event.getKeyCode(); int code = event.getKeyCode();
if (code == KeyEvent.VK_ESCAPE) { if (code == KeyEvent.VK_ESCAPE) {
return false; // Cell editors will process the Escape key, so let them have it. Otherwise, allow the
// system to process the Escape key as, described above.
return isCellEditing(textComponent);
} }
// We've made the executive decision to allow all keys to go through to the text component // We've made the executive decision to allow all keys to go through to the text component
@ -310,7 +312,22 @@ public class KeyBindingOverrideKeyEventDispatcher implements KeyEventDispatcher
} }
// the key is modified; let it through if the component has a mapping for the key // the key is modified; let it through if the component has a mapping for the key
return hasRegisteredKeyBinding((JTextComponent) destination, event); return hasRegisteredKeyBinding(textComponent, event);
}
private boolean isCellEditing(JTextComponent c) {
Container parent = c.getParent();
while (parent != null) {
if (parent instanceof JTree tree) {
return tree.isEditing();
}
else if (parent instanceof JTable table) {
return table.isEditing();
}
parent = parent.getParent();
}
return false;
} }
/** /**