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

improve mapping with modifier keys

This commit is contained in:
Thomas Jentzsch 2019-08-08 11:46:43 +02:00
parent 7cd45ec32a
commit 18d5045d8e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/EventMappingWidget.cxx
View File

@ -263,8 +263,12 @@ bool EventMappingWidget::handleKeyDown(StellaKey key, StellaMod mod)
// Remap keys in remap mode
if (myRemapStatus && myActionSelected >= 0)
{
myLastKey = key;
// TODO: further improve logic here
// Avoid overwriting normal keys with modifier keys
if (!myMod || (key < KBDK_LCTRL || key > KBDK_RGUI))
myLastKey = key;
myMod |= mod;
// cerr << myLastKey << ", " << key << endl;
}
return true;
}
@ -278,7 +282,7 @@ bool EventMappingWidget::handleKeyUp(StellaKey key, StellaMod mod)
{
Event::Type event =
instance().eventHandler().eventAtIndex(myActionSelected, myEventMode);
if (instance().eventHandler().addKeyMapping(event, myEventMode, StellaKey(myLastKey), StellaMod(myMod)))
if (myLastKey == 0 || instance().eventHandler().addKeyMapping(event, myEventMode, StellaKey(myLastKey), StellaMod(myMod)))
stopRemapping();
}
return true;