From 220e4bcd99e20da5fd9127e5a9e5f44494ab13de Mon Sep 17 00:00:00 2001 From: spycrab Date: Tue, 6 Feb 2018 11:00:23 +0100 Subject: Qt/MappingButton: light up when mapped key is pressed --- Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp') diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp index 883d329473..5e66b033b0 100644 --- a/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp +++ b/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp @@ -47,9 +47,13 @@ QGroupBox* MappingWidget::CreateGroupBox(const QString& name, ControllerEmu::Con group_box->setLayout(form_layout); + bool need_indicator = group->type == ControllerEmu::GroupType::Cursor || + group->type == ControllerEmu::GroupType::Stick || + group->type == ControllerEmu::GroupType::Tilt; + for (auto& control : group->controls) { - auto* button = new MappingButton(this, control->control_ref.get()); + auto* button = new MappingButton(this, control->control_ref.get(), !need_indicator); button->setMinimumWidth(100); button->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); @@ -87,6 +91,9 @@ QGroupBox* MappingWidget::CreateGroupBox(const QString& name, ControllerEmu::Con m_bools.push_back(checkbox); } + if (need_indicator) + form_layout->addRow(new MappingIndicator(group)); + return group_box; } -- cgit v1.2.3 From ec54b421a4f47f64dc66c394ad3e880be38a3b96 Mon Sep 17 00:00:00 2001 From: spycrab Date: Wed, 7 Feb 2018 18:16:15 +0100 Subject: Qt/Mapping: Implement indicators --- Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp') diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp index 5e66b033b0..5c2261de06 100644 --- a/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp +++ b/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp @@ -11,6 +11,7 @@ #include "DolphinQt2/Config/Mapping/IOWindow.h" #include "DolphinQt2/Config/Mapping/MappingBool.h" #include "DolphinQt2/Config/Mapping/MappingButton.h" +#include "DolphinQt2/Config/Mapping/MappingIndicator.h" #include "DolphinQt2/Config/Mapping/MappingNumeric.h" #include "DolphinQt2/Config/Mapping/MappingWindow.h" #include "InputCommon/ControlReference/ControlReference.h" @@ -49,7 +50,8 @@ QGroupBox* MappingWidget::CreateGroupBox(const QString& name, ControllerEmu::Con bool need_indicator = group->type == ControllerEmu::GroupType::Cursor || group->type == ControllerEmu::GroupType::Stick || - group->type == ControllerEmu::GroupType::Tilt; + group->type == ControllerEmu::GroupType::Tilt || + group->type == ControllerEmu::GroupType::MixedTriggers; for (auto& control : group->controls) { -- cgit v1.2.3