vkconfig: Fix switching of missing layer

LunarG · Sep 11, 2024 · 85a615b · 85a615b
1 parent bb8b322
commit 85a615b
Show file tree

Hide file tree

Showing 14 changed files with 853 additions and 983 deletions.
diff --git a/vkconfig_core/layer.cpp b/vkconfig_core/layer.cpp
@@ -49,6 +49,8 @@
 
 const char* Layer::NO_PRESET = "User-Defined Settings";
 
+bool operator<(const LayersPathInfo& a, const LayersPathInfo& b) { return a.path.RelativePath() < b.path.RelativePath(); }
+
 Layer::Layer() : status(STATUS_STABLE), platforms(PLATFORM_DESKTOP_BIT) {}
 
 Layer::Layer(const std::string& key) : key(key), status(STATUS_STABLE), platforms(PLATFORM_DESKTOP_BIT) {}

diff --git a/vkconfig_core/layer.h b/vkconfig_core/layer.h
@@ -40,6 +40,8 @@ struct LayersPathInfo {
     bool enabled = true;
 };
 
+bool operator<(const LayersPathInfo& a, const LayersPathInfo& b);
+
 class Layer {
    public:
     static const char* NO_PRESET;

diff --git a/vkconfig_core/layer_manager.cpp b/vkconfig_core/layer_manager.cpp
@@ -276,6 +276,9 @@ const Layer *LayerManager::Find(const std::string &layer_name, const Version &la
         return this->Find(layer_name, latest);
     } else {
         for (std::size_t i = 0, n = this->selected_layers.size(); i < n; ++i) {
+            if (this->selected_layers[i].visible == false) {
+                continue;
+            }
             if (this->selected_layers[i].key != layer_name) {
                 continue;
             }
@@ -359,6 +362,8 @@ void LayerManager::AddPath(const LayersPathInfo &info) {
     } else {
         this->paths[LAYERS_PATHS_GUI].push_back(info);
     }
+
+    std::sort(this->paths[LAYERS_PATHS_GUI].begin(), this->paths[LAYERS_PATHS_GUI].end());
 }
 
 void LayerManager::RemovePath(const LayersPathInfo &path_info) {

diff --git a/vkconfig_core/type_tab.cpp b/vkconfig_core/type_tab.cpp
@@ -26,9 +26,9 @@
 const char* GetToken(TabType type) {
     static const char* TOKENS[]{
         "DIAGNOSTIC",      // TAB_DIAGNOSTIC
-        "APPLICATIONS",    // TAB_APPLICATIONS
-        "LAYERS",          // TAB_LAYERS
         "CONFIGURATIONS",  // TAB_CONFIGURATIONS
+        "LAYERS",          // TAB_LAYERS
+        "APPLICATIONS",    // TAB_APPLICATIONS
         "PREFERENCES",     // TAB_PREFERENCES
         "HELP"             // TAB_HELP
     };

diff --git a/vkconfig_core/type_tab.h b/vkconfig_core/type_tab.h
@@ -22,9 +22,9 @@
 
 enum TabType {
     TAB_DIAGNOSTIC = 0,
-    TAB_APPLICATIONS,
-    TAB_LAYERS,
     TAB_CONFIGURATIONS,
+    TAB_LAYERS,
+    TAB_APPLICATIONS,
     TAB_PREFERENCES,
     TAB_HELP,
 

diff --git a/vkconfig_gui/mainwindow.cpp b/vkconfig_gui/mainwindow.cpp
@@ -481,7 +481,10 @@ QStringList MainWindow::BuildEnvVariables() const {
     return env;
 }
 
-void MainWindow::on_tab_widget_currentChanged(int index) { this->tabs[index]->UpdateUI(UPDATE_REBUILD_UI); }
+void MainWindow::on_tab_widget_currentChanged(int index) {
+    assert(index >= 0);
+    this->tabs[index]->UpdateUI(UPDATE_REBUILD_UI);
+}
 
 void MainWindow::on_push_button_launcher_clicked() {
     // Are we already monitoring a running app? If so, terminate it