summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
diff options
context:
space:
mode:
authorJordan Woyak <jordan.woyak@gmail.com>2019-04-27 14:23:29 -0500
committerJordan Woyak <jordan.woyak@gmail.com>2019-04-27 14:23:29 -0500
commitaf8b14f452d355745b4f8deea68f3784da03b0d0 (patch)
tree509549283015c055913687fc252f7dd5364f1884 /Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
parent687907e44d14901f3f64664e09bfd482997a2e0e (diff)
DolphinQt: Move mapping indicators to top of UI.
Diffstat (limited to 'Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp')
-rw-r--r--Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp25
1 files changed, 18 insertions, 7 deletions
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
index 2cd768feea..72abaa2fd1 100644
--- a/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
@@ -97,7 +97,18 @@ QColor MappingIndicator::GetGateColor() const
MappingIndicator::MappingIndicator(ControllerEmu::ControlGroup* group) : m_group(group)
{
- setMinimumHeight(128);
+ // TODO: Make these magic numbers less ugly.
+ int required_height = 106;
+
+ if (ControllerEmu::GroupType::MixedTriggers == group->type)
+ required_height = 64 + 1;
+
+ setFixedHeight(required_height);
+}
+
+double MappingIndicator::GetScale() const
+{
+ return height() / 2 - 2;
}
namespace
@@ -178,7 +189,7 @@ void MappingIndicator::DrawCursor(ControllerEmu::Cursor& cursor)
UpdateCalibrationWidget({raw_coord.x, raw_coord.y});
// Bounding box size:
- const double scale = height() / 2.5;
+ const double scale = GetScale();
QPainter p(this);
p.translate(width() / 2, height() / 2);
@@ -291,7 +302,7 @@ void MappingIndicator::DrawReshapableInput(ControllerEmu::ReshapableInput& stick
UpdateCalibrationWidget(raw_coord);
// Bounding box size:
- const double scale = height() / 2.5;
+ const double scale = GetScale();
QPainter p(this);
p.translate(width() / 2, height() / 2);
@@ -453,7 +464,7 @@ void MappingIndicator::DrawForce(ControllerEmu::Force& force)
UpdateCalibrationWidget({raw_coord.x, raw_coord.y});
// Bounding box size:
- const double scale = height() / 2.5;
+ const double scale = GetScale();
QPainter p(this);
p.translate(width() / 2, height() / 2);
@@ -592,7 +603,7 @@ void ShakeMappingIndicator::DrawShake()
m_position_samples.pop_back();
// Bounding box size:
- const double scale = height() / 2.5;
+ const double scale = GetScale();
QPainter p(this);
p.translate(width() / 2, height() / 2);
@@ -657,8 +668,8 @@ void ShakeMappingIndicator::DrawShake()
void MappingIndicator::DrawCalibration(QPainter& p, Common::DVec2 point)
{
- // TODO: Ugly magic number used in a few places in this file.
- const double scale = height() / 2.5;
+ // Bounding box size:
+ const double scale = GetScale();
// Input shape.
p.setPen(GetInputShapePen());