diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp index f1cf24b68d..ef807b9d8f 100644 --- a/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp +++ b/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp @@ -29,7 +29,6 @@ namespace { -const QColor CENTER_COLOR = Qt::blue; const QColor C_STICK_GATE_COLOR = Qt::yellow; const QColor CURSOR_TV_COLOR = 0xaed6f1; const QColor TILT_GATE_COLOR = 0xa2d9ce; @@ -65,6 +64,11 @@ QColor MappingIndicator::GetAdjustedInputColor() const return Qt::red; } +QColor MappingIndicator::GetCenterColor() const +{ + return Qt::blue; +} + QColor MappingIndicator::GetDeadZoneColor() const { return palette().shadow().color(); @@ -265,7 +269,7 @@ void MappingIndicator::DrawCursor(ControllerEmu::Cursor& cursor) if (center.x || center.y) { p.setPen(Qt::NoPen); - p.setBrush(CENTER_COLOR); + p.setBrush(GetCenterColor()); p.drawEllipse(QPointF{center.x, center.y} * scale, INPUT_DOT_RADIUS, INPUT_DOT_RADIUS); } @@ -363,7 +367,7 @@ void MappingIndicator::DrawReshapableInput(ControllerEmu::ReshapableInput& stick if (center.x || center.y) { p.setPen(Qt::NoPen); - p.setBrush(CENTER_COLOR); + p.setBrush(GetCenterColor()); p.drawEllipse(QPointF{center.x, center.y} * scale, INPUT_DOT_RADIUS, INPUT_DOT_RADIUS); } @@ -566,7 +570,7 @@ void MappingIndicator::DrawForce(ControllerEmu::Force& force) if (center.x || center.y) { p.setPen(Qt::NoPen); - p.setBrush(CENTER_COLOR); + p.setBrush(GetCenterColor()); p.drawEllipse(QPointF{center.x, center.y} * scale, INPUT_DOT_RADIUS, INPUT_DOT_RADIUS); } @@ -711,6 +715,14 @@ void MappingIndicator::DrawCalibration(QPainter& p, Common::DVec2 point, Common: [this](double angle) { return m_calibration_widget->GetCalibrationRadiusAtAngle(angle); }, scale, center)); + // Center. + if (center.x || center.y) + { + p.setPen(Qt::NoPen); + p.setBrush(GetCenterColor()); + p.drawEllipse(QPointF{center.x, center.y} * scale, INPUT_DOT_RADIUS, INPUT_DOT_RADIUS); + } + // Stick position. p.setPen(Qt::NoPen); p.setBrush(GetAdjustedInputColor()); diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.h b/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.h index 6bc24d8a33..e7f5450e06 100644 --- a/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.h +++ b/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.h @@ -40,6 +40,7 @@ protected: QBrush GetBBoxBrush() const; QColor GetRawInputColor() const; QPen GetInputShapePen() const; + QColor GetCenterColor() const; QColor GetAdjustedInputColor() const; QColor GetDeadZoneColor() const; QPen GetDeadZonePen() const;