Merge branch 'release-3.3.5' into fix/client-credential-auto-selection

Author: paulhazen

Assets/Plugins/Source/Editor/EditorWindows/EOSSettingsWindow.cs

@@ -178,15 +178,15 @@ protected override async Task AsyncSetup()
             int tabIndex = 0;
             foreach (PlatformManager.Platform platform in Enum.GetValues(typeof(PlatformManager.Platform)))
             {
-                // This makes sure that the currently selected tab (upon first loading the window) is always the current platform.
-                if (_selectedTab != -1 || platform == PlatformManager.CurrentPlatform)
+                if (!PlatformManager.TryGetConfigType(platform, out Type configType) || null == configType)
                 {
-                    _selectedTab = tabIndex;
+                    continue;
                 }
 
-                if (!PlatformManager.TryGetConfigType(platform, out Type configType) || null == configType)
+                // This makes sure that the currently selected tab (upon first loading the window) is always the current platform.
+                if (_selectedTab == -1 && platform == PlatformManager.CurrentTargetedPlatform)
                 {
-                    continue;
+                    _selectedTab = tabIndex;
                 }
 
                 Type constructedType =
@@ -202,17 +202,15 @@ protected override async Task AsyncSetup()
                 // Do not add the platform if it is not currently available.
                 if (!editor.IsPlatformAvailable())
                 {
-                    // We only increment the tab index if the editor has been
-                    // added to the tabs.
-                    tabIndex++;
                     continue;
                 }
 #endif
 
+                tabIndex++;
+
                 _platformConfigEditors.Add(editor);
 
                 tabContents.Add(new GUIContent($" {editor.GetLabelText()}", editor.GetPlatformIconTexture()));
-
             }
 
             // If (for some reason) a default platform was not selected, then
@@ -237,7 +235,13 @@ protected override void RenderWindow()
 
             if (_platformTabs != null && _platformConfigEditors.Count != 0)
             {
-                _selectedTab = GUILayout.Toolbar(_selectedTab, _platformTabs, TAB_STYLE);
+                var newlySelectedTabIndex = GUILayout.Toolbar(_selectedTab, _platformTabs, TAB_STYLE);
+
+                if (newlySelectedTabIndex != _selectedTab)
+                {
+                    _selectedTab = newlySelectedTabIndex;
+                }
+
                 GUILayout.Space(30);
 
                 _ = _platformConfigEditors[_selectedTab].RenderAsync();

com.playeveryware.eos/Runtime/Core/PlatformManager.cs

@@ -159,12 +159,42 @@ public static Platform CurrentPlatform
                 }
                 else
                 {
+                    // Note that s_CurrentPlatform is not set in this context - making sure it's only set once.
+                    // TODO: Investigate whether this has unintended consequences - where setting the value is
+                    //       expected.
                     Debug.Log($"CurrentPlatform has already been assigned as {GetFullName(s_CurrentPlatform)}.");
                 }
 
             }
         }
 
+        /// <summary>
+        /// Backing value for the CurrentTargetedPlatform property.
+        /// </summary>
+        private static Platform s_CurrentTargetedPlatform;
+
+        // This compile conditional is here because this property is only 
+        // meaningful in the context of the Unity Editor running.
+#if UNITY_EDITOR
+        /// <summary>
+        /// Used to indicate what platform is currently being targeted for
+        /// compilation. Used primarily to select the appropriate platform in
+        /// config editors.
+        /// </summary>
+        public static Platform CurrentTargetedPlatform
+        {
+            get
+            {
+                if (!TryGetPlatform(EditorUserBuildSettings.activeBuildTarget, out Platform targetedPlatform))
+                {
+                    return Platform.Unknown;
+                }
+
+                return targetedPlatform;
+            }
+        }
+#endif
+
         /// <summary>
         /// To be accessible to the platform manager, the static constructors 
         /// for each platform config need to be executed, this function ensures
@@ -204,16 +234,10 @@ static PlatformManager()
             // is Windows.
 #if EXTERNAL_TO_UNITY
             CurrentPlatform = Platform.Windows;
-#else
-            // If the Unity Editor is currently running, then the "active"
-            // Platform is whatever the current build target is.
-#if UNITY_EDITOR
-            if (TryGetPlatform(EditorUserBuildSettings.activeBuildTarget, out Platform platform))
 #else
             // If the Unity editor is _not_ currently running, then the "active"
             // platform is whatever the runtime application says it is
             if (TryGetPlatform(Application.platform, out Platform platform))
-#endif
             {
                 CurrentPlatform = platform;
             }