summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConnor McLaughlin <stenzek@gmail.com>2019-08-04 20:28:17 +1000
committerGitHub <noreply@github.com>2019-08-04 20:28:17 +1000
commitd3151d880809efdfca9b622c696df6413cc25955 (patch)
tree5f924a29190035e410df468a5a581de44e7f7f3e
parent7de6b57c13235a56ddda024ae46f76e88170522f (diff)
parentcbfc442e9099825e44c9390b6712773c43ec5aac (diff)
Merge pull request #8278 from Miksel12/qt-changes
DolphinQt: Limit numeric widget width
-rw-r--r--Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp2
-rw-r--r--Source/Core/DolphinQt/Config/Mapping/MappingNumeric.cpp2
-rw-r--r--Source/Core/DolphinQt/Config/Mapping/MappingWidget.h2
3 files changed, 5 insertions, 1 deletions
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp
index 7eade0b77d..4fa2e0c926 100644
--- a/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp
@@ -49,7 +49,7 @@ MappingButton::MappingButton(MappingWidget* parent, ControlReference* ref, bool
setFixedHeight(minimumSizeHint().height());
// Make sure that long entries don't throw our layout out of whack.
- setFixedWidth(112);
+ setFixedWidth(WIDGET_MAX_WIDTH);
setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingNumeric.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingNumeric.cpp
index cab6c68d9b..b2231f8ec6 100644
--- a/Source/Core/DolphinQt/Config/Mapping/MappingNumeric.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingNumeric.cpp
@@ -15,6 +15,8 @@ MappingDouble::MappingDouble(MappingWidget* parent, ControllerEmu::NumericSettin
setRange(m_setting.GetMinValue(), m_setting.GetMaxValue());
setDecimals(2);
+ setFixedWidth(WIDGET_MAX_WIDTH);
+
if (const auto ui_suffix = m_setting.GetUISuffix())
setSuffix(QStringLiteral(" ") + tr(ui_suffix));
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingWidget.h b/Source/Core/DolphinQt/Config/Mapping/MappingWidget.h
index 1b66a92a4d..cd06a3ded8 100644
--- a/Source/Core/DolphinQt/Config/Mapping/MappingWidget.h
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingWidget.h
@@ -10,6 +10,8 @@
#include <QString>
#include <QWidget>
+constexpr int WIDGET_MAX_WIDTH = 112;
+
class ControlGroupBox;
class InputConfig;
class IOWindow;