vkconfig3: Fix layer settings export chechbox

LunarG · Dec 4, 2024 · 32d60b8 · 32d60b8
1 parent 4860024
commit 32d60b8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/vkconfig_core/configuration.cpp b/vkconfig_core/configuration.cpp
@@ -170,6 +170,9 @@ bool Configuration::Load(const Path& full_path, const LayerManager& layers) {
             if (json_layer_object.value("type") != QJsonValue::Undefined) {
                 parameter.type = GetLayerType(json_layer_object.value("type").toString().toStdString().c_str());
             }
+            if (json_layer_object.value("override_settings") != QJsonValue::Undefined) {
+                parameter.override_settings = json_layer_object.value("override_settings").toBool();
+            }
 
             const Layer* layer = layers.Find(parameter.key, parameter.api_version);
 
@@ -264,6 +267,7 @@ bool Configuration::Save(const Path& full_path) const {
             json_layer.insert("manifest", parameter.manifest.RelativePath().c_str());
         }
         SaveStringArray(json_layer, "platforms", GetPlatformTokens(parameter.platform_flags));
+        json_layer.insert("override_settings", parameter.override_settings);
 
         QJsonArray json_settings;
         for (std::size_t j = 0, m = parameter.settings.size(); j < m; ++j) {

diff --git a/vkconfig_core/version.cpp b/vkconfig_core/version.cpp
@@ -32,7 +32,7 @@ const Version Version::VKCONFIG(3, 0, 0);
 const Version Version::VKHEADER(VK_HEADER_VERSION_COMPLETE);
 const Version Version::NONE(0, 0, 0);
 const Version Version::LATEST(~0, ~0, ~0);
-const Version Version::REQUIRED_LOADER_VERSION(1, 3, 302);
+const Version Version::REQUIRED_LOADER_VERSION(1, 3, 301);
 
 const char *VKCONFIG_NAME = "Vulkan Configurator";
 const char *VKCONFIG_SHORT_NAME = "vkconfig";

diff --git a/vkconfig_gui/settings_tree.cpp b/vkconfig_gui/settings_tree.cpp
@@ -83,7 +83,7 @@ void SettingsTreeManager::CreateGUI() {
 
     this->ui->configurations_group_box_settings->blockSignals(true);
     this->ui->configurations_group_box_settings->setTitle(format("%s:", title.c_str()).c_str());
-    this->ui->configurations_group_box_settings->setCheckable(configurator.advanced);
+    this->ui->configurations_group_box_settings->setCheckable(configurator.HasEnabledUI(ENABLE_UI_SETTINGS));
     this->ui->configurations_group_box_settings->setChecked(parameter->override_settings);
     this->ui->configurations_group_box_settings->blockSignals(false);
     this->ui->configurations_presets->setVisible(!layer->presets.empty());

diff --git a/vkconfig_gui/tab_configurations.cpp b/vkconfig_gui/tab_configurations.cpp
@@ -296,8 +296,8 @@ void TabConfigurations::UpdateUI_Settings(UpdateUIMode mode) {
         this->ui->configurations_group_box_settings->setToolTip(tooltip.c_str());
     }
 
-    this->ui->configurations_group_box_settings->setEnabled(configurator.HasEnabledUI(ENABLE_UI_SETTINGS));
-    this->ui->configurations_group_box_settings->setCheckable(configurator.HasEnabledUI(ENABLE_UI_SETTINGS));
+    //this->ui->configurations_group_box_settings->setEnabled(configurator.HasEnabledUI(ENABLE_UI_SETTINGS));
+    //this->ui->configurations_group_box_settings->setCheckable(configurator.HasEnabledUI(ENABLE_UI_SETTINGS));
 }
 
 void TabConfigurations::UpdateUI(UpdateUIMode ui_update_mode) {