Skip to content
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

Add new mappings for numlock, numpadenter and numpadcomma on X11 #1937

Merged
merged 2 commits into from Dec 11, 2021
Merged

Add new mappings for numlock, numpadenter and numpadcomma on X11 #1937

merged 2 commits into from Dec 11, 2021

Conversation

blaind
Copy link
Contributor

@blaind blaind commented May 11, 2021

  • Tested on all platforms changed
  • Compilation warnings were addressed
  • cargo fmt has been run on this branch
  • cargo doc builds successfully
  • Added an entry to CHANGELOG.md if knowledge of this change could be valuable to users
  • Updated documentation to reflect any user-facing changes, including notes of platform-specific behavior
  • Created or updated an example program if it would help users understand this functionality
  • Updated feature matrix, if new features were added or implemented

@ArturKovacs
Copy link
Contributor

We are hoping to release the new keyboard API in the next version of winit, which should include all of these. So right now, I would instead encourage you @blaind, to join us in testing #1932, if you can.

@maroider
Copy link
Member

We are hoping to release the new keyboard API in the next version of winit, which should include all of these.

I have half a mind to close this PR, #1266, #1846, and #1864 on this basis.

@ogoffart
Copy link
Contributor

I think this could merged as-is. It is kind of trivial, and the small bug it fixes does not need to wait that the new keyboard API is finished.

@ArturKovacs
Copy link
Contributor

Yeah we can merge this. @maroider do you have anything against this?

@ogoffart
Copy link
Contributor

ogoffart commented Dec 7, 2021

ping?

@maroider
Copy link
Member

maroider commented Dec 7, 2021

Welp, I completely forgot about this.

I don't have anything in particular against this, but I suspect you'll have to take some extra steps to ensure the changelog entry ends up in the right place.

@ArturKovacs
Copy link
Contributor

@maroider good point. I suggest rebasing this on master.

@blaind
Copy link
Contributor Author

blaind commented Dec 9, 2021

@maroider good point. I suggest rebasing this on master.

Was about to rebase, but made a mistake and now too many commits are visible in the pull request. Will fix later today.

@maroider
Copy link
Member

maroider commented Dec 9, 2021

It looks like you did a merge instead of a rebase.

@blaind
Copy link
Contributor Author

blaind commented Dec 9, 2021

It looks like you did a merge instead of a rebase.

Should be fixed now. Based on the master branch & force-pushed

CHANGELOG.md Outdated Show resolved Hide resolved
Co-authored-by: Markus Røyset <maroider@protonmail.com>
@maroider maroider merged commit 438d286 into rust-windowing:master Dec 11, 2021
@maroider maroider mentioned this pull request Jan 5, 2022
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging this pull request may close these issues.

None yet

4 participants