preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-11-12 09:09:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12135 from hrydgard/fix-mi-box-remote-click

Browse Source 
Fix mi box remote control center click
This commit is contained in:
Henrik Rydgård authored and GitHub committed 2019-06-25 22:26:32 +02:00
2 parents 279b1d94be c5b9e9f718
commit 5ac658e76b
3 files changed
+12 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Common/KeyMap.cpp
+1
View File
@@ -303,6 +303,7 @@ void UpdateNativeMenuKeys() {
KeyDef(DEVICE_ID_KEYBOARD, NKCODE_SPACE),
KeyDef(DEVICE_ID_KEYBOARD, NKCODE_ENTER),
KeyDef(DEVICE_ID_ANY, NKCODE_BUTTON_A),
KeyDef(DEVICE_ID_PAD_0, NKCODE_DPAD_CENTER), // A number of Android devices.
};
// If they're not already bound, add them in.
Common/Vulkan/VulkanContext.cpp
+1 -1
View File
@@ -851,7 +851,7 @@ bool VulkanContext::InitQueue() {
// Get the list of VkFormats that are supported:
uint32_t formatCount = 0;
VkResult res = vkGetPhysicalDeviceSurfaceFormatsKHR(physical_devices_[physical_device_], surface_, &formatCount, nullptr);
_assert_msg_(G3D, res == VK_SUCCESS, "Failed to get formats for device %p: %d surface: %p", physical_devices_[physical_device_], (int)res, surface_);
_assert_msg_(G3D, res == VK_SUCCESS, "Failed to get formats for device %d: %d", physical_device_, (int)res);
if (res != VK_SUCCESS) {
return false;
}
ext/native/ui/view.cpp
+10 -1
View File
@@ -364,6 +364,8 @@ bool IsDPadKey(const KeyInput &key) {
bool IsAcceptKey(const KeyInput &key) {
if (confirmKeys.empty()) {
// 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;
} else {
@@ -376,6 +378,8 @@ bool IsAcceptKey(const KeyInput &key) {
bool IsEscapeKey(const KeyInput &key) {
if (cancelKeys.empty()) {
// This path is pretty much not used, cancelKeys should be set.
// TODO: Get rid of this stuff?
if (key.deviceId == DEVICE_ID_KEYBOARD) {
return key.keyCode == NKCODE_ESCAPE || key.keyCode == NKCODE_BACK;
} else {
@@ -388,6 +392,8 @@ bool IsEscapeKey(const KeyInput &key) {
bool IsTabLeftKey(const KeyInput &key) {
if (tabLeftKeys.empty()) {
// This path is pretty much not used, tabLeftKeys should be set.
// TODO: Get rid of this stuff?
return key.keyCode == NKCODE_BUTTON_L1;
} else {
return MatchesKeyDef(tabLeftKeys, key);
@@ -396,6 +402,8 @@ bool IsTabLeftKey(const KeyInput &key) {
bool IsTabRightKey(const KeyInput &key) {
if (tabRightKeys.empty()) {
// This path is pretty much not used, tabRightKeys should be set.
// TODO: Get rid of this stuff?
return key.keyCode == NKCODE_BUTTON_R1;
} else {
return MatchesKeyDef(tabRightKeys, key);
@@ -408,6 +416,7 @@ bool Clickable::Key(const KeyInput &key) {
return false;
}
// TODO: Replace most of Update with this.
bool ret = false;
if (key.flags & KEY_DOWN) {
if (IsAcceptKey(key)) {
@@ -958,7 +967,7 @@ bool TextEdit::Key(const KeyInput &input) {
if (!HasFocus())
return false;
bool textChanged = false;
// Process navigation keys. These aren't chars.
// Process hardcoded navigation keys. These aren't chars.
if (input.flags & KEY_DOWN) {
switch (input.keyCode) {
case NKCODE_CTRL_LEFT: