Skip to content

more sensible handling of our special hotkey default binding "conflicts"#4584

Merged
vadosnaprimer merged 1 commit intomasterfrom
hotkey_conflict
Apr 15, 2026
Merged

more sensible handling of our special hotkey default binding "conflicts"#4584
vadosnaprimer merged 1 commit intomasterfrom
hotkey_conflict

Conversation

@SuuperW
Copy link
Copy Markdown
Contributor

@SuuperW SuuperW commented Dec 13, 2025

Previously I'd introduced code to automatically detect conflicts with our default hotkey bindings. I had made it ignore RA hotkeys, since some of those are bound to the same keys as other hotkeys but that didn't seem to be an actual issue.

I think this way of doing it is better, though: Instead of ignoring RA hotkeys, ignore the other group that has the same keys bound: TAStudio's analog edit hotkeys. I think this is better because MainForm.Hotkey.cs has special handling for analog editing mode, which prevents all other hotkeys from being triggered if analog edit mode is active. So it is actually impossible for these to conflict with anything else. But there is no such special handling for RA hotkeys. (Maybe there should be? I don't know.)

Someone familiar with the RA integration might have a different idea here.

@RetroEdit
Copy link
Copy Markdown
Contributor

RetroEdit commented Dec 14, 2025

I had a different solution in #4516 but I wasn't necessarily fully happy with that. (Not sure either way about this PR -- haven't looked at it carefully yet.)

@vadosnaprimer vadosnaprimer merged commit 0520345 into master Apr 15, 2026
8 checks passed
@vadosnaprimer vadosnaprimer deleted the hotkey_conflict branch April 15, 2026 15:33
@YoshiRulz YoshiRulz added the App: EmuHawk Relating to EmuHawk frontend label Apr 20, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

App: EmuHawk Relating to EmuHawk frontend

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants