Unity 6000.1.0a5 C# reference source code

Author: Unity Technologies

Editor/Mono/AssemblyReloadEvents.cs

@@ -27,15 +27,23 @@ public static event AssemblyReloadCallback afterAssemblyReload
         [RequiredByNativeCode]
         static void OnBeforeAssemblyReload()
         {
+            using var scope = new ProgressScope("OnBeforeAssemblyReload Callback", "", forceShow: true);
             foreach (var evt in m_BeforeAssemblyReloadEvent)
+            {
+                scope.SetText($"{evt.Method?.DeclaringType?.FullName}.{evt.Method?.Name}", true);
                 evt();
+            }
         }
 
         [RequiredByNativeCode]
         static void OnAfterAssemblyReload()
         {
+            using var scope = new ProgressScope("OnAfterAssemblyReload Callback", "", forceShow: true);
             foreach (var evt in m_AfterAssemblyReloadEvent)
+            {
+                scope.SetText($"{evt.Method?.DeclaringType?.FullName}.{evt.Method?.Name}", true);
                 evt();
+            }
         }
     }
 }

Editor/Mono/EditorApplication.bindings.cs

@@ -367,5 +367,14 @@ internal static extern GUID buildSessionGUID
             [FreeFunction("GetBuildSettings().GetBuildSessionGUID")]
             get;
         }
+
+        public static extern bool isFocused
+        {
+            [StaticAccessor("GetApplication()", StaticAccessorType.Dot)]
+            get;
+
+            [StaticAccessor("GetApplication()", StaticAccessorType.Dot)]
+            private set;
+        }
     }
 }

Editor/Mono/EditorApplication.cs

@@ -284,7 +284,6 @@ public static event Action<PlayModeStateChange> playModeStateChanged
         internal static Func<bool> doPressedKeysTriggerAnyShortcut;
 
         public static event Action<bool> focusChanged;
-        public static bool isFocused { get; private set; }
 
         // Windows were reordered
         internal static CallbackFunction windowsReordered;
@@ -477,8 +476,12 @@ static void Internal_PauseStateChanged(PauseState state)
             playmodeStateChanged?.Invoke();
             #pragma warning restore 618
 
+            using var scope = new ProgressScope($"PauseStateChanged Callback", "" , forceShow: true);
             foreach (var evt in m_PauseStateChangedEvent)
+            {
+                scope.SetText($"{evt.Method?.DeclaringType?.FullName}.{evt.Method?.Name}", true);
                 evt(state);
+            }
         }
 
         [RequiredByNativeCode]
@@ -487,9 +490,28 @@ static void Internal_PlayModeStateChanged(PlayModeStateChange state)
             #pragma warning disable 618
             playmodeStateChanged?.Invoke();
             #pragma warning restore 618
-
+            if (!m_PlayModeStateChangedEvent.hasSubscribers) return;
+            var stateName = state.ToString();
+
+            // Without this workaround, you will fail Editor.GameViewTests.Playmode_PlayUnfocused_IsUnfocused_WhenGameViewFocused
+            // You can still trigger UUM-74498 by showing a ProgressScope in EnteredPlayMode (including in usercode with EditorUtility.DisplayProgressBar)
+            // This is because a progress bar going away will cause the previously focused window to be refocused
+            // The underlying issue is being tracked in UUM-86918 and this workaround should be undone as part of the fix there
+            if (PlayModeView.GetMainPlayModeView() is GameView { enterPlayModeBehavior: PlayModeView.EnterPlayModeBehavior.PlayUnfocused }
+                && state == PlayModeStateChange.EnteredPlayMode)
+            {
+                foreach (var evt in m_PlayModeStateChangedEvent)
+                {
+                    evt(state);
+                }
+                return;
+            }
+            using var scope = new ProgressScope($"PlayModeStateChanged Callback ({stateName})", "", forceShow: true);
             foreach (var evt in m_PlayModeStateChangedEvent)
+            {
+                scope.SetText($"{evt.Method?.DeclaringType?.FullName}.{evt.Method?.Name}", true);
                 evt(state);
+            }
         }
 
         [RequiredByNativeCode]

Editor/Mono/EditorAssemblies.cs

@@ -113,10 +113,15 @@ private static void ProcessInitializeOnLoadAttributes(Type[] types)
                 sortedTypes = types.OrderBy(x => Array.IndexOf(m_topologicallySortedAssemblies, x.Assembly));
             }
 
+            using var scope = new ProgressScope("Process InitializeOnLoad Attributes", "", forceShow: true);
+
             foreach (Type type in sortedTypes)
             {
-                using (_profilerMarkerProcessInitializeOnLoadAttributes.Auto(reportTimes, () => type.AssemblyQualifiedName))
+                using (_profilerMarkerProcessInitializeOnLoadAttributes.Auto(reportTimes,
+                           () => type.AssemblyQualifiedName))
                 {
+                    var typeFullName = type?.FullName;
+                    scope.SetText($"{typeFullName}.{typeFullName}", true);
                     try
                     {
                         RuntimeHelpers.RunClassConstructor(type.TypeHandle);
@@ -137,10 +142,13 @@ private static void ProcessInitializeOnLoadAttributes(Type[] types)
         private static void ProcessInitializeOnLoadMethodAttributes()
         {
             bool reportTimes = (bool)Debug.GetDiagnosticSwitch("EnableDomainReloadTimings").value;
+            using var scope = new ProgressScope("Process InitializeOnLoadMethod Attributes", "", forceShow: true);
             foreach (var method in TypeCache.GetMethodsWithAttribute<InitializeOnLoadMethodAttribute>())
             {
-                using (_profilerMarkerProcessInitializeOnLoadMethodAttributes.Auto(reportTimes, () => $"{method.DeclaringType?.FullName}::{method.Name}"))
+                using (_profilerMarkerProcessInitializeOnLoadMethodAttributes.Auto(reportTimes,
+                           () => $"{method.DeclaringType?.FullName}::{method.Name}"))
                 {
+                    scope.SetText($"${method.DeclaringType?.FullName}.{method?.Name}", true);
                     try
                     {
                         method.Invoke(null, null);

Editor/Mono/GUI/TreeView/TreeViewController.cs

@@ -743,7 +743,7 @@ public void OnGUI(Rect rect, int keyboardControlID)
             KeyboardGUI();
 
             if (m_UseScrollView)
-                GUI.EndScrollView(showingVerticalScrollBar);
+                GUI.EndScrollView(showingVerticalScrollBar || showingHorizontalScrollBar);
             else
                 GUI.EndClip();