Skip to content

Commit 56f1697

Browse files
author
davidkline-ms
committed
pr feedback
1 parent dbc577a commit 56f1697

File tree

2 files changed

+12
-16
lines changed

2 files changed

+12
-16
lines changed

Assets/MixedRealityToolkit/Inspectors/Setup/MixedRealityProjectConfiguratorWindow.cs

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using UnityEditor;
77
using UnityEditor.Compilation;
88
using UnityEngine;
9-
9+
using UnityEngine.Experimental.UIElements;
1010
using MRConfig = Microsoft.MixedReality.Toolkit.Utilities.Editor.MixedRealityProjectConfigurator.Configurations;
1111

1212
namespace Microsoft.MixedReality.Toolkit.Utilities.Editor
@@ -95,29 +95,25 @@ private void OnGUI()
9595
{
9696
MixedRealityInspectorUtility.RenderMixedRealityToolkitLogo();
9797

98+
string foldoutHeader;
99+
98100
if (!MixedRealityProjectConfigurator.IsProjectConfigured())
99101
{
102+
foldoutHeader = "Modify Configurations";
100103
RenderChoiceDialog();
101-
102-
EditorGUILayout.Space();
103-
104-
showConfigurations = EditorGUILayout.Foldout(showConfigurations, "Modify Configurations", true);
105-
if (showConfigurations)
106-
{
107-
RenderConfigurations();
108-
}
109104
}
110105
else
111106
{
107+
foldoutHeader = "Configurations";
112108
RenderConfiguredConfirmation();
109+
}
113110

114-
EditorGUILayout.Space();
111+
EditorGUILayout.Space();
115112

116-
showConfigurations = EditorGUILayout.Foldout(showConfigurations, "Configurations", true);
117-
if (showConfigurations)
118-
{
119-
RenderConfigurations();
120-
}
113+
showConfigurations = EditorGUILayout.Foldout(showConfigurations, foldoutHeader, true);
114+
if (showConfigurations)
115+
{
116+
RenderConfigurations();
121117
}
122118
}
123119

Assets/MixedRealityToolkit/Utilities/Editor/Setup/MixedRealityProjectConfigurator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ public static void ConfigureProject(HashSet<Configurations> filter = null)
221221
{
222222
foreach (var setter in ConfigurationSetters)
223223
{
224-
setter.Value.Invoke();
224+
Configure(setter.Key);
225225
}
226226
}
227227
else

0 commit comments

Comments
 (0)