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

fix 'Reset' and 'Default' for multiple event mappings

This commit is contained in:
thrust26 2019-05-26 21:35:15 +02:00
parent b45b192445
commit a9e4531104
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/PKeyboardHandler.cxx
View File

@ -62,6 +62,8 @@ void PhysicalKeyboardHandler::setDefaultMapping(Event::Type event, EventMode mod
if (eraseAll) if (eraseAll)
// Erase all mappings of given mode // Erase all mappings of given mode
myKeyMap.eraseMode(mode); myKeyMap.eraseMode(mode);
else
myKeyMap.eraseEvent(event, mode);
auto setDefaultKey = [&](Event::Type k_event, StellaKey key, int mod = KBDM_NONE) auto setDefaultKey = [&](Event::Type k_event, StellaKey key, int mod = KBDM_NONE)
{ {
@ -77,7 +79,6 @@ void PhysicalKeyboardHandler::setDefaultMapping(Event::Type event, EventMode mod
} }
else if (eraseAll || k_event == event) else if (eraseAll || k_event == event)
{ {
myKeyMap.eraseEvent(k_event, mode);
myKeyMap.add(k_event, mode, key, mod); myKeyMap.add(k_event, mode, key, mod);
} }
}; };
@ -345,6 +346,12 @@ bool PhysicalKeyboardHandler::handleAltEvent(StellaKey key, StellaMod mod, bool
} }
else else
#endif #endif
if (key == KBDK_RETURN)
{
int i = 0;
}
if(key == KBDK_TAB) if(key == KBDK_TAB)
{ {
// Swallow Alt-Tab, but remember that it happened // Swallow Alt-Tab, but remember that it happened