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 --- .../DolphinQt2/Config/Mapping/MappingButton.cpp | 34 +++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) (limited to 'Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp') diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp index fb38472eed..3e147f33af 100644 --- a/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp +++ b/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp @@ -7,6 +7,9 @@ #include #include #include +#include + +#include #include "DolphinQt2/Config/Mapping/MappingButton.h" @@ -16,6 +19,7 @@ #include "DolphinQt2/Config/Mapping/MappingWidget.h" #include "DolphinQt2/Config/Mapping/MappingWindow.h" #include "DolphinQt2/QtUtils/BlockUserInputFilter.h" +#include "DolphinQt2/Settings.h" #include "InputCommon/ControlReference/ControlReference.h" #include "InputCommon/ControllerEmu/ControllerEmu.h" #include "InputCommon/ControllerInterface/ControllerInterface.h" @@ -26,11 +30,39 @@ static QString EscapeAmpersand(QString&& string) return string.replace(QStringLiteral("&"), QStringLiteral("&&")); } -MappingButton::MappingButton(MappingWidget* widget, ControlReference* ref) +MappingButton::MappingButton(MappingWidget* widget, ControlReference* ref, bool indicator) : ElidedButton(EscapeAmpersand(QString::fromStdString(ref->GetExpression()))), m_parent(widget), m_reference(ref) { Connect(); + if (!m_reference->IsInput() || !indicator) + return; + + m_timer = new QTimer(this); + connect(m_timer, &QTimer::timeout, this, [this] { + if (!isActiveWindow()) + return; + + Settings::Instance().SetControllerStateNeeded(true); + + auto state = m_reference->State(); + + QFont f = m_parent->font(); + QPalette p = m_parent->palette(); + + if (state != 0) + { + f.setBold(true); + p.setColor(QPalette::ButtonText, Qt::red); + } + + setFont(f); + setPalette(p); + + Settings::Instance().SetControllerStateNeeded(false); + }); + + m_timer->start(1000 / 30); } void MappingButton::Connect() -- 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/MappingButton.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp') diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp index 3e147f33af..4c41a90057 100644 --- a/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp +++ b/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp @@ -35,6 +35,8 @@ MappingButton::MappingButton(MappingWidget* widget, ControlReference* ref, bool m_reference(ref) { Connect(); + setToolTip( + tr("Left-click to detect input.\nMiddle-click to clear.\nRight-click for more options.")); if (!m_reference->IsInput() || !indicator) return; @@ -116,6 +118,7 @@ void MappingButton::Clear() { m_reference->SetExpression(""); m_parent->SaveSettings(); + Update(); } void MappingButton::Update() @@ -136,7 +139,7 @@ void MappingButton::mouseReleaseEvent(QMouseEvent* event) else emit AdvancedPressed(); return; - case Qt::MouseButton::MiddleButton: + case Qt::MouseButton::MidButton: Clear(); return; case Qt::MouseButton::RightButton: -- cgit v1.2.3