preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-20 17:59:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

UI: Allow overriding dialog logic on finish.

Browse Source 
This seems cleaner.
This commit is contained in:
Unknown W. Brackets committed 2017-03-19 17:43:03 -07:00
1 parent d8600229f4
commit 073e056369
12 files changed
+37 -31
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UI/ControlMappingScreen.cpp
+4 -4
View File
@@ -310,7 +310,7 @@ bool KeyMappingNewKeyDialog::key(const KeyInput &key) {
mapped_ = true;
KeyDef kdf(key.deviceId, key.keyCode);
screenManager()->finishDialog(this, DR_OK);
TriggerFinish(DR_OK);
if (callback_)
callback_(kdf);
}
@@ -347,7 +347,7 @@ bool KeyMappingNewKeyDialog::axis(const AxisInput &axis) {
if (axis.value > AXIS_BIND_THRESHOLD) {
mapped_ = true;
KeyDef kdf(axis.deviceId, KeyMap::TranslateKeyCodeFromAxis(axis.axisId, 1));
screenManager()->finishDialog(this, DR_OK);
TriggerFinish(DR_OK);
if (callback_)
callback_(kdf);
}
@@ -355,7 +355,7 @@ bool KeyMappingNewKeyDialog::axis(const AxisInput &axis) {
if (axis.value < -AXIS_BIND_THRESHOLD) {
mapped_ = true;
KeyDef kdf(axis.deviceId, KeyMap::TranslateKeyCodeFromAxis(axis.axisId, -1));
screenManager()->finishDialog(this, DR_OK);
TriggerFinish(DR_OK);
if (callback_)
callback_(kdf);
}
@@ -437,7 +437,7 @@ void JoystickHistoryView::Update() {
bool AnalogTestScreen::key(const KeyInput &key) {
bool retval = true;
if (UI::IsEscapeKey(key)) {
screenManager()->finishDialog(this, DR_BACK);
TriggerFinish(DR_BACK);
return true;
}