Mirror/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-01 14:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15620 from iota97/np-enter

Browse Source 
Add numpad enter as a confirm
This commit is contained in:
Henrik Rydgård authored and GitHub committed 2022-06-22 09:50:50 +02:00
2 parents f924a3ed11 0288717206
commit 4b78224d22
3 files changed
+3 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Common/UI/UIScreen.cpp
+1 -1
View File
@@ -235,7 +235,7 @@ bool PopupScreen::touch(const TouchInput &touch) {
bool PopupScreen::key(const KeyInput &key) {
if (key.flags & KEY_DOWN) {
if (key.keyCode == NKCODE_ENTER && defaultButton_) {
if ((key.keyCode == NKCODE_ENTER || key.keyCode == NKCODE_NUMPAD_ENTER) && defaultButton_) {
UI::EventParams e{};
defaultButton_->OnClick.Trigger(e);
return true;
Common/UI/View.cpp
+1 -1
View File
@@ -279,7 +279,7 @@ bool IsAcceptKey(const KeyInput &key) {
// This path is pretty much not used, confirmKeys should be set.
// TODO: Get rid of this stuff?
if (key.deviceId == DEVICE_ID_KEYBOARD) {
return key.keyCode == NKCODE_SPACE || key.keyCode == NKCODE_ENTER || key.keyCode == NKCODE_Z;
return key.keyCode == NKCODE_SPACE || key.keyCode == NKCODE_ENTER || key.keyCode == NKCODE_Z || key.keyCode == NKCODE_NUMPAD_ENTER;
} else {
return key.keyCode == NKCODE_BUTTON_A || key.keyCode == NKCODE_BUTTON_CROSS || key.keyCode == NKCODE_BUTTON_1 || key.keyCode == NKCODE_DPAD_CENTER;
}
Core/KeyMap.cpp
+1
View File
@@ -81,6 +81,7 @@ void UpdateNativeMenuKeys() {
const KeyDef hardcodedConfirmKeys[] = {
KeyDef(DEVICE_ID_KEYBOARD, NKCODE_SPACE),
KeyDef(DEVICE_ID_KEYBOARD, NKCODE_ENTER),
KeyDef(DEVICE_ID_KEYBOARD, NKCODE_NUMPAD_ENTER),
KeyDef(DEVICE_ID_ANY, NKCODE_BUTTON_A),
KeyDef(DEVICE_ID_PAD_0, NKCODE_DPAD_CENTER), // A number of Android devices.
};