summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp
diff options
context:
space:
mode:
authorAnthony <Helios747@users.noreply.github.com>2018-02-18 11:45:12 -0800
committerGitHub <noreply@github.com>2018-02-18 11:45:12 -0800
commit4876b9d8e018ec79ddb213f175d81b26fb1d2e7b (patch)
treeed569c2a300461ab995864712aa2d09108e52d72 /Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp
parent6a609e6e3c5ac4f832f4f03082185cb46fd682e4 (diff)
parentec54b421a4f47f64dc66c394ad3e880be38a3b96 (diff)
Merge pull request #6362 from spycrab/qt_indicators
Qt/Mapping: Implement indicators
Diffstat (limited to 'Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp')
-rw-r--r--Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp39
1 files changed, 37 insertions, 2 deletions
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp
index ca1aa5157a..147602e7a8 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp
+++ b/Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp
@@ -7,6 +7,9 @@
#include <QMouseEvent>
#include <QRegExp>
#include <QString>
+#include <QTimer>
+
+#include <iostream>
#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,41 @@ 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();
+ setToolTip(
+ tr("Left-click to detect input.\nMiddle-click to clear.\nRight-click for more options."));
+ 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()
@@ -85,6 +119,7 @@ void MappingButton::Clear()
{
m_reference->SetExpression("");
m_parent->SaveSettings();
+ Update();
}
void MappingButton::Update()
@@ -105,7 +140,7 @@ void MappingButton::mouseReleaseEvent(QMouseEvent* event)
else
emit AdvancedPressed();
return;
- case Qt::MouseButton::MiddleButton:
+ case Qt::MouseButton::MidButton:
Clear();
return;
case Qt::MouseButton::RightButton: