Skip to content

Add extra hotkey button row in the mapper #3147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 23, 2023
Merged

Conversation

johnnovak
Copy link
Member

@johnnovak johnnovak commented Nov 23, 2023

Description

Prior to this change, the 6th mapper row was overlapped by the key binding instructions. This dirty hackery fixes that and buys us some time before nuking & rebuilding this good thing... 😅

Manual testing

Before

Start with machine = hercules and behold the mapper:

image

So far so good. Now click on "Swap Image".

image

Ooops!

image

After

image

image

Checklist

Please tick the items as you have addressed them. Don't remove items; leave the ones that are not applicable unchecked.

I have:

  • followed the project's contributing guidelines and code of conduct.
  • performed a self-review of my code.
  • commented on the particularly hard-to-understand areas of my code.
  • split my work into well-defined, bisectable commits, and I named my commits well.
  • applied the appropriate labels (bug, enhancement, refactoring, documentation, etc.)
  • checked that all my commits can be built.
  • confirmed that my code does not cause performance regressions (e.g., by running the Quake benchmark).
  • added unit tests where applicable to prove the correctness of my code and to avoid future regressions.
  • made corresponding changes to the documentation or the website according to the documentation guidelines.
  • locally verified my website or documentation changes.

Prior to this change, the 6th mapper row was overlapped by the key
binding instructions.
@johnnovak johnnovak added the bug Something isn't working label Nov 23, 2023
@johnnovak johnnovak self-assigned this Nov 23, 2023
@johnnovak johnnovak marked this pull request as ready for review November 23, 2023 08:27
@Burrito78
Copy link
Collaborator

Works for me, good job chopping this thing into into shape a bit.

Copy link
Collaborator

@weirddan455 weirddan455 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like a good fix. I'm not going to try to figure out what those values actually mean that you changed because I've seen the code in sdl_mapper.cpp and I value my sanity. I trust you though. Good job deciphering the mess in there and coming up with a solution 👍

@johnnovak
Copy link
Member Author

Looks like a good fix. I'm not going to try to figure out what those values actually mean that you changed because I've seen the code in sdl_mapper.cpp and I value my sanity. I trust you though. Good job deciphering the mess in there and coming up with a solution 👍

It was 80% trial and error, and I'm not ashamed of it 😎 It's a royal mess, and this solves a problem, so let's leave it at that, yeah 😅

@johnnovak johnnovak merged commit 06cb4bc into main Nov 23, 2023
@kcgen kcgen deleted the jn/extra-hotkey-row branch December 4, 2023 23:29
@johnnovak johnnovak added the input handling Issues related to handling any input (keyboard, mouse, joystick & game controllers) label Dec 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working input handling Issues related to handling any input (keyboard, mouse, joystick & game controllers)
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants