ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Fix toggled actions on gamepads (fixes #1650)

This commit is contained in:
Vicki Pfau 2020-01-28 18:13:39 -08:00
parent ef5ef903fe
commit 8f46887535
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -10,6 +10,7 @@ Other fixes:
- Qt: Fix color selection in asset view (fixes mgba.io/i/1648) - Qt: Fix color selection in asset view (fixes mgba.io/i/1648)
- Qt: Fix missing OSD messages - Qt: Fix missing OSD messages
- Qt: Fix crash unloading shaders - Qt: Fix crash unloading shaders
- Qt: Fix toggled actions on gamepads (fixes mgba.io/i/1650)
0.8.0: (2020-01-21) 0.8.0: (2020-01-21)
Features: Features:

18
src/platform/qt/ShortcutController.cpp
View File

@ -159,7 +159,11 @@ bool ShortcutController::eventFilter(QObject*, QEvent* event) {
} }
Action* action = item.value()->action(); Action* action = item.value()->action();
if (action) { if (action) {
action->trigger(); if (m_actions->isHeld(action->name())) {
action->trigger(true);
} else {
action->trigger(!action->isActive());
}
} }
event->accept(); event->accept();
return true; return true;
@ -170,7 +174,7 @@ bool ShortcutController::eventFilter(QObject*, QEvent* event) {
return false; return false;
} }
Action* action = item.value()->action(); Action* action = item.value()->action();
if (action) { if (action && m_actions->isHeld(action->name())) {
action->trigger(false); action->trigger(false);
} }
event->accept(); event->accept();
@ -184,7 +188,15 @@ bool ShortcutController::eventFilter(QObject*, QEvent* event) {
} }
Action* action = item.value()->action(); Action* action = item.value()->action();
if (action) { if (action) {
action->trigger(gae->isNew()); if (gae->isNew()) {
if (m_actions->isHeld(action->name())) {
action->trigger(true);
} else {
action->trigger(!action->isActive());
}
} else if (m_actions->isHeld(action->name())) {
action->trigger(false);
}
} }
event->accept(); event->accept();
return true; return true;