From 8e9bbad72c80a25ef1a2e08f0fc0361808533119 Mon Sep 17 00:00:00 2001 From: rainmakerv2 <30595646+jpau02@users.noreply.github.com> Date: Sun, 2 Feb 2025 21:08:38 +0800 Subject: [PATCH] Remove parsing from save function, make window more compact --- src/qt_gui/control_settings.cpp | 7 +- src/qt_gui/control_settings.ui | 186 ++++++++++++++++++-------------- 2 files changed, 107 insertions(+), 86 deletions(-) diff --git a/src/qt_gui/control_settings.cpp b/src/qt_gui/control_settings.cpp index b1b729350..5fa40923b 100644 --- a/src/qt_gui/control_settings.cpp +++ b/src/qt_gui/control_settings.cpp @@ -255,13 +255,12 @@ void ControlSettings::SaveControllerConfig(bool CloseOnSave) { } output_file.close(); - Input::ParseInputConfig(config_id); + Config::SetUseUnifiedInputConfig(!ui->PerGameCheckBox->isChecked()); + Config::save(Common::FS::GetUserPath(Common::FS::PathType::UserDir) / "config.toml"); + if (CloseOnSave) { QWidget::close(); } - - Config::SetUseUnifiedInputConfig(!ui->PerGameCheckBox->isChecked()); - Config::save(Common::FS::GetUserPath(Common::FS::PathType::UserDir) / "config.toml"); } void ControlSettings::SetDefault() { diff --git a/src/qt_gui/control_settings.ui b/src/qt_gui/control_settings.ui index fb354be23..fda85b0d3 100644 --- a/src/qt_gui/control_settings.ui +++ b/src/qt_gui/control_settings.ui @@ -11,8 +11,8 @@ 0 0 - 1067 - 801 + 1012 + 721 @@ -39,8 +39,8 @@ 0 0 - 1045 - 743 + 994 + 673 @@ -72,6 +72,12 @@ true + + + 0 + 0 + + 16777215 @@ -266,7 +272,7 @@ Qt::Orientation::Vertical - QSizePolicy::Policy::Expanding + QSizePolicy::Policy::Maximum @@ -279,7 +285,7 @@ - + 0 0 @@ -289,49 +295,51 @@ - - - - - - 0 - 0 - - - - Left Deadzone - - - Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - - - - - - 0 - 0 - - - - 1 - - - 127 - - - Qt::Orientation::Horizontal - - - - + + + + 0 + 0 + + + + Left Deadzone + + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + + + + + + 0 + 0 + + + + 1 + + + 127 + + + Qt::Orientation::Horizontal + + + + + 0 + 0 + + 0 @@ -536,6 +544,12 @@ + + + 0 + 0 + + 12 @@ -907,6 +921,12 @@ + + + 0 + 0 + + Face Buttons @@ -1084,7 +1104,7 @@ Qt::Orientation::Vertical - QSizePolicy::Policy::Expanding + QSizePolicy::Policy::Maximum @@ -1097,7 +1117,7 @@ - + 0 0 @@ -1107,49 +1127,51 @@ - - - - - - 0 - 0 - - - - Right Deadzone - - - Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter - - - - - - - - 0 - 0 - - - - 1 - - - 127 - - - Qt::Orientation::Horizontal - - - - + + + + 0 + 0 + + + + Right Deadzone + + + Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter + + + + + + + + 0 + 0 + + + + 1 + + + 127 + + + Qt::Orientation::Horizontal + + + + + 0 + 0 + + 0