Skip to content
Permalink
Browse files

Draw center when calibrating and remove constant

This adds the center to the calibration menu when it is nonzero.
It also refactors CENTER_COLOR to be a function, similar to other colors
after an earlier commit.
  • Loading branch information...
artemist committed May 18, 2019
1 parent 49e46c8 commit 99cf9a57fc931ced60e95a391c46a64cf4578988
@@ -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());
@@ -40,6 +40,7 @@ class MappingIndicator : public QWidget
QBrush GetBBoxBrush() const;
QColor GetRawInputColor() const;
QPen GetInputShapePen() const;
QColor GetCenterColor() const;
QColor GetAdjustedInputColor() const;
QColor GetDeadZoneColor() const;
QPen GetDeadZonePen() const;

0 comments on commit 99cf9a5

Please sign in to comment.
You can’t perform that action at this time.