Merge remote-tracking branch

'origin/GP-5440_ghidragon_fixing_nav_history_when_repeating_mem_search'
(Closes #7445)
This commit is contained in:
Ryan Kurtz 2025-03-04 12:18:20 -05:00
commit 1e18516eb5
3 changed files with 9 additions and 1 deletions

View file

@ -457,4 +457,8 @@ class MemorySearchControlPanel extends JPanel {
}
}
Component getDefaultFocusComponent() {
return searchInputField;
}
}

View file

@ -231,13 +231,16 @@ public class MemorySearchPlugin extends Plugin implements MemorySearchService {
if (match != null) {
lastSearchAddress = match.getAddress();
Program program = navigatable.getProgram();
navigatable.goTo(program, new BytesFieldLocation(program, match.getAddress()));
GoToService service = tool.getService(GoToService.class);
service.goTo(navigatable, new BytesFieldLocation(program, match.getAddress()),
program);
}
else {
Msg.showWarn(this, null, "Match Not Found",
"No match found going forward for " + lastByteMatcher.getInput());
}
}
}
public void setShowOptionsPanel(boolean show) {

View file

@ -139,6 +139,7 @@ public class MemorySearchProvider extends ComponentProviderAdapter
setVisible(true);
createActions(plugin.getName());
setDefaultFocusComponent(searchPanel.getDefaultFocusComponent());
tool.addContextListener(this);
navigatable.addNavigatableListener(this);