Try to support Qt keyboard input directly. Fixes #11653 #11720
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ckname crash on mac)
hrydgard
changed the title
unknownbrackets
requested changes
Jan 6, 2019
UI/GameSettingsScreen.cpp
Outdated
| #elif defined(USING_QT_UI) | ||
| systemSettings->Add(new Choice(sy->T("Change Nickname")))->OnClick.Handle(this, &GameSettingsScreen::OnChangeNickname); | ||
| // #elif defined(USING_QT_UI) | ||
| // systemSettings->Add(new Choice(sy->T("Change Nickname")))->OnClick.Handle(this, &GameSettingsScreen::OnChangeNickname); |
There was a problem hiding this comment.
We should just delete rather than leaving in commented code, git remembers forever after all.
-[Unknown]
Qt/QtMain.cpp
Outdated
| NativeKey(KeyInput(DEVICE_ID_KEYBOARD, KeyMapRawQttoNative.find(((QKeyEvent*)e)->key())->second, KEY_DOWN)); | ||
| { | ||
| auto qtKeycode = ((QKeyEvent*)e)->key(); | ||
| int nativeKeycode = KeyMapRawQttoNative.find(qtKeycode)->second; |
There was a problem hiding this comment.
Hm, another tab/space battleground.
I realize this was here before, but I wonder now: is KeyMapRawQttoNative guaranteed to have all keys in it?
-[Unknown]
There was a problem hiding this comment.
I noticed it too but was too lazy to do anything about it since it was already there. I'll change it.
unknownbrackets
approved these changes
Jan 6, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #11653 by avoiding the native dialog which can't be spawned from the main thread.