izzy/ppsspp
0
0
Fork 0
mirror of https://github.com/izzy2lost/ppsspp.git synced 2026-03-10 12:43:04 -07:00
Code Issues Packages Projects Releases Wiki Activity

Control mapping UI: Fix bug where we warn about combo mappings unnecessarily for axis input

Browse Source
This commit is contained in:
Henrik Rydgård
2023-12-20 15:37:46 +01:00
parent d339a4b985
commit 2d4e59eb62
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
UI/ControlMappingScreen.cpp
View File

@@ -423,7 +423,8 @@ void KeyMappingNewKeyDialog::axis(const AxisInput &axis) {
InputMapping mapping(axis.deviceId, axis.axisId, 1);
triggeredAxes_.insert(mapping);
if (!g_Config.bAllowMappingCombos && !mapping_.mappings.empty()) {
comboMappingsNotEnabled_->SetVisibility(UI::V_VISIBLE);
if (mapping_.mappings.size() == 1 && mapping != mapping_.mappings[0])
comboMappingsNotEnabled_->SetVisibility(UI::V_VISIBLE);
} else if (!mapping_.mappings.contains(mapping)) {
mapping_.mappings.push_back(mapping);
RecreateViews();
@@ -432,7 +433,8 @@ void KeyMappingNewKeyDialog::axis(const AxisInput &axis) {
InputMapping mapping(axis.deviceId, axis.axisId, -1);
triggeredAxes_.insert(mapping);
if (!g_Config.bAllowMappingCombos && !mapping_.mappings.empty()) {
comboMappingsNotEnabled_->SetVisibility(UI::V_VISIBLE);
if (mapping_.mappings.size() == 1 && mapping != mapping_.mappings[0])
comboMappingsNotEnabled_->SetVisibility(UI::V_VISIBLE);
} else if (!mapping_.mappings.contains(mapping)) {
mapping_.mappings.push_back(mapping);
RecreateViews();