From 5a1db191852c68e352d1ce3e48cbae18de09c428 Mon Sep 17 00:00:00 2001 From: tverona1 Date: Fri, 23 Aug 2019 22:11:43 -0700 Subject: [PATCH] Only show auto tabs that are actually populated --- Assets/Resources/OVRBuildConfig.asset | 2 +- Assets/Scripts/GridPopulation.cs | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Assets/Resources/OVRBuildConfig.asset b/Assets/Resources/OVRBuildConfig.asset index f2d36f8..cf5cd6c 100644 --- a/Assets/Resources/OVRBuildConfig.asset +++ b/Assets/Resources/OVRBuildConfig.asset @@ -12,6 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 20553fac56ec59645857c0732b787431, type: 3} m_Name: OVRBuildConfig m_EditorClassIdentifier: - androidSDKPath: C:\Users\tvero\AppData\Local\Android\Sdk + androidSDKPath: gradlePath: jdkPath: diff --git a/Assets/Scripts/GridPopulation.cs b/Assets/Scripts/GridPopulation.cs index c0aeb6b..65d3fa7 100644 --- a/Assets/Scripts/GridPopulation.cs +++ b/Assets/Scripts/GridPopulation.cs @@ -125,17 +125,22 @@ namespace QuestAppLauncher var rightTabs = new List(); // Set auto tabs + var autoTabs = AppProcessor.Auto_Tabs.Intersect( + apps.Where(x => null != x.Value.AutoTabName).Select(x => x.Value.AutoTabName) + .Distinct(StringComparer.CurrentCultureIgnoreCase).ToList(), + StringComparer.CurrentCultureIgnoreCase); + if (config.autoCategory.Equals(Config.Category_Top, StringComparison.OrdinalIgnoreCase)) { - topTabs.AddRange(AppProcessor.Auto_Tabs); + topTabs.AddRange(autoTabs); } else if (config.autoCategory.Equals(Config.Category_Left, StringComparison.OrdinalIgnoreCase)) { - leftTabs.AddRange(AppProcessor.Auto_Tabs); + leftTabs.AddRange(autoTabs); } else if (config.autoCategory.Equals(Config.Category_Right, StringComparison.OrdinalIgnoreCase)) { - rightTabs.AddRange(AppProcessor.Auto_Tabs); + rightTabs.AddRange(autoTabs); } // Set custom tabs, sorted alphabetically