diff options
| author | Léo Lam <leo@leolam.fr> | 2019-01-16 21:33:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-16 21:33:05 +0100 |
| commit | e19ee2ad4f8159a9e8f630c8ebc319c748527da8 (patch) | |
| tree | 4d827715af1bac19b0aa3fdbbf34a5d95bc3e5de /Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp | |
| parent | 3892c3ac481cdde5c9631ba0c8845660c7a95586 (diff) | |
| parent | df43fd94725ee1abda8eb0c69efcd116c48db399 (diff) | |
Merge pull request #7664 from jordan-woyak/kill-button-threshold
ControllerEmu: Killed the button group threshold setting.
Diffstat (limited to 'Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp index 343b522704..11dfe7d924 100644 --- a/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp +++ b/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp @@ -26,6 +26,7 @@ #include "DolphinQt/Settings.h" #include "InputCommon/ControlReference/ControlReference.h" +#include "InputCommon/ControllerEmu/ControlGroup/Buttons.h" #include "InputCommon/ControllerEmu/ControllerEmu.h" #include "InputCommon/ControllerInterface/ControllerInterface.h" #include "InputCommon/ControllerInterface/Device.h" @@ -81,7 +82,7 @@ MappingButton::MappingButton(MappingWidget* widget, ControlReference* ref, bool QFont f = m_parent->font(); QPalette p = m_parent->palette(); - if (state != 0) + if (state > ControllerEmu::Buttons::ACTIVATION_THRESHOLD) { f.setBold(true); p.setColor(QPalette::ButtonText, Qt::red); |