mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-10-01 14:58:14 +00:00
Merge pull request #17717 from hrydgard/input-dialog-back-button-fix
Fix key event processing issue.
This commit is contained in:
3 files changed
+4
-5
No files matched your search
+2
-2
@@ -263,8 +263,8 @@ KeyEventResult UnsyncKeyEvent(const KeyInput &key, ViewGroup *root) {
|
||||
return retval;
|
||||
}
|
||||
|
||||
void KeyEvent(const KeyInput &key, ViewGroup *root) {
|
||||
root->Key(key);
|
||||
bool KeyEvent(const KeyInput &key, ViewGroup *root) {
|
||||
return root->Key(key);
|
||||
}
|
||||
|
||||
void TouchEvent(const TouchInput &touch, ViewGroup *root) {
|
||||
|
||||
+1
-1
@@ -33,7 +33,7 @@ enum class KeyEventResult {
|
||||
// Hooks arrow keys for navigation
|
||||
KeyEventResult UnsyncKeyEvent(const KeyInput &key, ViewGroup *root);
|
||||
|
||||
void KeyEvent(const KeyInput &key, ViewGroup *root);
|
||||
bool KeyEvent(const KeyInput &key, ViewGroup *root);
|
||||
void TouchEvent(const TouchInput &touch, ViewGroup *root);
|
||||
void AxisEvent(const AxisInput &axis, ViewGroup *root);
|
||||
|
||||
|
||||
@@ -74,8 +74,7 @@ void UIScreen::axis(const AxisInput &axis) {
|
||||
|
||||
bool UIScreen::key(const KeyInput &key) {
|
||||
if (!ignoreInput_ && root_) {
|
||||
UI::KeyEvent(key, root_);
|
||||
return false;
|
||||
return UI::KeyEvent(key, root_);
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user