Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-27 00:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

filterTrigger: filter negative trigger axis event after positive axis detection

Browse source 
If filterTrigger detects a positive axis event on a common trigger axis while also
configuring a trigger, the next input event will be a negative axis press
(as the trigger needs to transition from >0 to rest at -32767).

Filter this negative event or else the next item in the configuration dialog
(typically "left thumb") will erroneously detect this as a separate event.
This commit is contained in:
Conn O'Griofa 2019-07-26 20:30:44 +01:00
parent 5edecef9c8
commit 7ac6ffcdbe
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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