Merge branch 'fix_cs_settings_key_bindings_page' into 'master'

Fix CS Key Binding settings page See merge request OpenMW/openmw!3655
OpenMW · Dec 15, 2023 · ba7932f · ba7932f
2 parents c969aa4 + a29ae07
commit ba7932f
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 16 deletions.
diff --git a/apps/opencs/model/prefs/boolsetting.cpp b/apps/opencs/model/prefs/boolsetting.cpp
@@ -36,7 +36,7 @@ CSMPrefs::SettingWidgets CSMPrefs::BoolSetting::makeWidgets(QWidget* parent)
 
     connect(mWidget, &QCheckBox::stateChanged, this, &BoolSetting::valueChanged);
 
-    return SettingWidgets{ .mLabel = nullptr, .mInput = mWidget, .mLayout = nullptr };
+    return SettingWidgets{ .mLabel = nullptr, .mInput = mWidget };
 }
 
 void CSMPrefs::BoolSetting::updateWidget()

diff --git a/apps/opencs/model/prefs/coloursetting.cpp b/apps/opencs/model/prefs/coloursetting.cpp
@@ -41,7 +41,7 @@ CSMPrefs::SettingWidgets CSMPrefs::ColourSetting::makeWidgets(QWidget* parent)
 
     connect(mWidget, &CSVWidget::ColorEditor::pickingFinished, this, &ColourSetting::valueChanged);
 
-    return SettingWidgets{ .mLabel = label, .mInput = mWidget, .mLayout = nullptr };
+    return SettingWidgets{ .mLabel = label, .mInput = mWidget };
 }
 
 void CSMPrefs::ColourSetting::updateWidget()

diff --git a/apps/opencs/model/prefs/doublesetting.cpp b/apps/opencs/model/prefs/doublesetting.cpp
@@ -73,7 +73,7 @@ CSMPrefs::SettingWidgets CSMPrefs::DoubleSetting::makeWidgets(QWidget* parent)
 
     connect(mWidget, qOverload<double>(&QDoubleSpinBox::valueChanged), this, &DoubleSetting::valueChanged);
 
-    return SettingWidgets{ .mLabel = label, .mInput = mWidget, .mLayout = nullptr };
+    return SettingWidgets{ .mLabel = label, .mInput = mWidget };
 }
 
 void CSMPrefs::DoubleSetting::updateWidget()

diff --git a/apps/opencs/model/prefs/enumsetting.cpp b/apps/opencs/model/prefs/enumsetting.cpp
@@ -106,7 +106,7 @@ CSMPrefs::SettingWidgets CSMPrefs::EnumSetting::makeWidgets(QWidget* parent)
 
     connect(mWidget, qOverload<int>(&QComboBox::currentIndexChanged), this, &EnumSetting::valueChanged);
 
-    return SettingWidgets{ .mLabel = label, .mInput = mWidget, .mLayout = nullptr };
+    return SettingWidgets{ .mLabel = label, .mInput = mWidget };
 }
 
 void CSMPrefs::EnumSetting::updateWidget()

diff --git a/apps/opencs/model/prefs/intsetting.cpp b/apps/opencs/model/prefs/intsetting.cpp
@@ -65,7 +65,7 @@ CSMPrefs::SettingWidgets CSMPrefs::IntSetting::makeWidgets(QWidget* parent)
 
     connect(mWidget, qOverload<int>(&QSpinBox::valueChanged), this, &IntSetting::valueChanged);
 
-    return SettingWidgets{ .mLabel = label, .mInput = mWidget, .mLayout = nullptr };
+    return SettingWidgets{ .mLabel = label, .mInput = mWidget };
 }
 
 void CSMPrefs::IntSetting::updateWidget()

diff --git a/apps/opencs/model/prefs/modifiersetting.cpp b/apps/opencs/model/prefs/modifiersetting.cpp
@@ -47,7 +47,7 @@ namespace CSMPrefs
 
         connect(widget, &QPushButton::toggled, this, &ModifierSetting::buttonToggled);
 
-        return SettingWidgets{ .mLabel = label, .mInput = widget, .mLayout = nullptr };
+        return SettingWidgets{ .mLabel = label, .mInput = widget };
     }
 
     void ModifierSetting::updateWidget()

diff --git a/apps/opencs/model/prefs/setting.hpp b/apps/opencs/model/prefs/setting.hpp
@@ -23,7 +23,6 @@ namespace CSMPrefs
     {
         QLabel* mLabel;
         QWidget* mInput;
-        QGridLayout* mLayout;
     };
 
     class Setting : public QObject

diff --git a/apps/opencs/model/prefs/shortcutsetting.cpp b/apps/opencs/model/prefs/shortcutsetting.cpp
@@ -51,7 +51,7 @@ namespace CSMPrefs
 
         connect(widget, &QPushButton::toggled, this, &ShortcutSetting::buttonToggled);
 
-        return SettingWidgets{ .mLabel = label, .mInput = widget, .mLayout = nullptr };
+        return SettingWidgets{ .mLabel = label, .mInput = widget };
     }
 
     void ShortcutSetting::updateWidget()

diff --git a/apps/opencs/model/prefs/stringsetting.cpp b/apps/opencs/model/prefs/stringsetting.cpp
@@ -36,7 +36,7 @@ CSMPrefs::SettingWidgets CSMPrefs::StringSetting::makeWidgets(QWidget* parent)
 
     connect(mWidget, &QLineEdit::textChanged, this, &StringSetting::textChanged);
 
-    return SettingWidgets{ .mLabel = nullptr, .mInput = mWidget, .mLayout = nullptr };
+    return SettingWidgets{ .mLabel = nullptr, .mInput = mWidget };
 }
 
 void CSMPrefs::StringSetting::updateWidget()

diff --git a/apps/opencs/model/prefs/subcategory.cpp b/apps/opencs/model/prefs/subcategory.cpp
@@ -13,9 +13,6 @@ namespace CSMPrefs
 
     SettingWidgets Subcategory::makeWidgets(QWidget* /*parent*/)
     {
-        QGridLayout* const layout = new QGridLayout();
-        layout->setSizeConstraint(QLayout::SetMinAndMaxSize);
-
-        return SettingWidgets{ .mLabel = nullptr, .mInput = nullptr, .mLayout = layout };
+        return SettingWidgets{ .mLabel = nullptr, .mInput = nullptr };
     }
 }
diff --git a/apps/opencs/view/prefs/keybindingpage.cpp b/apps/opencs/view/prefs/keybindingpage.cpp
@@ -81,12 +81,12 @@ namespace CSVPrefs
             int next = mPageLayout->rowCount();
             mPageLayout->addWidget(widgets.mInput, next, 0, 1, 2);
         }
-        else if (widgets.mLayout != nullptr)
+        else
         {
             // Create new page
             QWidget* pageWidget = new QWidget();
-            mPageLayout = widgets.mLayout;
-            mPageLayout->setParent(pageWidget);
+            mPageLayout = new QGridLayout(pageWidget);
+            mPageLayout->setSizeConstraint(QLayout::SetMinAndMaxSize);
 
             mStackedLayout->addWidget(pageWidget);