Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-01-17 22:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #606 from psyke83/mSkipAxis_fix

Browse source 
filterTrigger: filter negative trigger axis event after positive axis…
This commit is contained in:
Jools Wills 2019-09-07 18:31:50 +01:00 committed by GitHub
parent eda3fe9c3b 7ac6ffcdbe
commit c384beedb0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
es-core/src/guis/GuiInputConfig.cpp
View file

@ -352,16 +352,28 @@ bool GuiInputConfig::filterTrigger(Input input, InputConfig* config, int inputId
) && InputManager::getInstance()->getAxisCountByDevice(config->getDeviceId()) == 6)
{
// digital triggers are unwanted
if (input.type == TYPE_BUTTON && (input.id == 6 || input.id == 7))
if(input.type == TYPE_BUTTON && (input.id == 6 || input.id == 7))
{
mHoldingInput = false;
return true;
}
}
// ignore negative pole for axes 2/5 only when triggers are being configured
if((mSkipAxis || strstr(GUI_INPUT_CONFIG_LIST[inputId].name, "Trigger") != NULL) \
&& input.type == TYPE_AXIS && (input.id == 2 || input.id == 5) && input.value < 0)
if(input.type == TYPE_AXIS && (input.id == 2 || input.id == 5))
{
mSkipAxis = true;
return true;
if(strstr(GUI_INPUT_CONFIG_LIST[inputId].name, "Trigger") != NULL)
{
if(input.value == 1)
mSkipAxis = true;
else if(input.value == -1)
return true;
}
else if(mSkipAxis)
{
mSkipAxis = false;
return true;
}
}
#else
(void)input;