Merge pull request #8278 from Miksel12/qt-changes

DolphinQt: Limit numeric widget width
dolphin-emu · Aug 4, 2019 · d3151d8 · d3151d8
2 parents 7de6b57 + cbfc442
commit d3151d8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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
@@ -10,6 +10,8 @@
 #include <QString>
 #include <QWidget>
 
+constexpr int WIDGET_MAX_WIDTH = 112;
+
 class ControlGroupBox;
 class InputConfig;
 class IOWindow;