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-0-dragonmacher-test-fixes-4-2-26'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-04-02 13:31:24 -04:00
parent e80da5ff2a 7081c0653a
commit 7a051ad6cb
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/script/GhidraScriptEditorComponentProvider.java
View File

@@ -249,8 +249,8 @@ public class GhidraScriptEditorComponentProvider extends ComponentProvider {
@Override
public boolean isEnabledForContext(ActionContext context) {
Object contextObject = context.getContextObject();
if (contextObject != GhidraScriptEditorComponentProvider.this) {
ComponentProvider contextProvider = context.getComponentProvider();
if (contextProvider != GhidraScriptEditorComponentProvider.this) {
return false;
}

8
Ghidra/Framework/Docking/src/main/java/docking/actions/KeyBindingsModel.java
View File

@@ -120,8 +120,12 @@ public class KeyBindingsModel {
String name = names.get(i);
KeyBindingState state = actionInfoByFullName.get(name);
String fullName = state.getFullName();
sb.append(fullName);
// Note: we do not use state.getFullName() here as that only displays 'Shared' for
// shared actions. We would like to see all shared action owners here.
String shortName = state.getName();
sb.append(shortName);
sb.append(" (").append(state.getOwnerDescription()).append(')');
if (i < names.size() - 1) {
sb.append("\n");
}