From ea7fe018b43d2cc4708bb983df551d72d8db3fde Mon Sep 17 00:00:00 2001 From: Pokechu22 Date: Wed, 14 Aug 2019 15:34:06 -0700 Subject: [PATCH] Revert TASInputWindow changes --- Source/Core/DolphinQt/TAS/TASInputWindow.cpp | 6 +++--- Source/Core/DolphinQt/TAS/TASInputWindow.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Core/DolphinQt/TAS/TASInputWindow.cpp b/Source/Core/DolphinQt/TAS/TASInputWindow.cpp index b19a3b72dfaa..a559ae887cb3 100644 --- a/Source/Core/DolphinQt/TAS/TASInputWindow.cpp +++ b/Source/Core/DolphinQt/TAS/TASInputWindow.cpp @@ -75,7 +75,7 @@ QGroupBox* TASInputWindow::CreateStickInputs(QString name, QSpinBox*& x_value, Q return box; } -QBoxLayout* TASInputWindow::CreateSliderValuePairLayout(QString name, QSpinBox*& value, int max, +QBoxLayout* TASInputWindow::CreateSliderValuePairLayout(QString name, QSpinBox*& value, u16 max, Qt::Key shortcut_key, QWidget* shortcut_widget, bool invert) { @@ -95,13 +95,13 @@ QBoxLayout* TASInputWindow::CreateSliderValuePairLayout(QString name, QSpinBox*& // The shortcut_widget argument needs to specify the container widget that will be hidden/shown. // This is done to avoid ambigous shortcuts -QSpinBox* TASInputWindow::CreateSliderValuePair(QBoxLayout* layout, int max, +QSpinBox* TASInputWindow::CreateSliderValuePair(QBoxLayout* layout, u16 max, QKeySequence shortcut_key_sequence, Qt::Orientation orientation, QWidget* shortcut_widget, bool invert) { auto* value = new QSpinBox(); - value->setRange(0, max); + value->setRange(0, 99999); connect(value, static_cast(&QSpinBox::valueChanged), [value, max](int i) { if (i > max) diff --git a/Source/Core/DolphinQt/TAS/TASInputWindow.h b/Source/Core/DolphinQt/TAS/TASInputWindow.h index 82d00d9fe791..90e25b03f2cb 100644 --- a/Source/Core/DolphinQt/TAS/TASInputWindow.h +++ b/Source/Core/DolphinQt/TAS/TASInputWindow.h @@ -26,10 +26,10 @@ class TASInputWindow : public QDialog protected: QGroupBox* CreateStickInputs(QString name, QSpinBox*& x_value, QSpinBox*& y_value, u16 max_x, u16 max_y, Qt::Key x_shortcut_key, Qt::Key y_shortcut_key); - QBoxLayout* CreateSliderValuePairLayout(QString name, QSpinBox*& value, int max, + QBoxLayout* CreateSliderValuePairLayout(QString name, QSpinBox*& value, u16 max, Qt::Key shortcut_key, QWidget* shortcut_widget, bool invert = false); - QSpinBox* CreateSliderValuePair(QBoxLayout* layout, int max, QKeySequence shortcut_key_sequence, + QSpinBox* CreateSliderValuePair(QBoxLayout* layout, u16 max, QKeySequence shortcut_key_sequence, Qt::Orientation orientation, QWidget* shortcut_widget, bool invert = false); template