Unity 2022.1.0b16 C# reference source code

Author: Unity Technologies

Editor/Mono/Scripting/APIUpdater/APIUpdaterAssemblyHelper.cs

@@ -48,13 +48,7 @@ internal static int Run(string arguments, string workingDir, out string stdOut,
             return assemblyUpdaterProcess.ExitCode;
         }
 
-        static string AssemblyUpdaterPath()
-        {
-            var unescapedAssemblyUpdaterPath = EditorApplication.applicationContentsPath + "/Tools/ScriptUpdater/AssemblyUpdater.exe";
-            return Application.platform == RuntimePlatform.WindowsEditor
-                ? CommandLineFormatter.EscapeCharsWindows(unescapedAssemblyUpdaterPath)
-                : CommandLineFormatter.EscapeCharsQuote(unescapedAssemblyUpdaterPath);
-        }
+        static string AssemblyUpdaterPath() => EditorApplication.applicationContentsPath + "/Tools/ScriptUpdater/AssemblyUpdater.exe";
 
         internal static string ArgumentsForUpdateAssembly(string assemblyPath, string tempOutputPath, IEnumerable<string> updateConfigSourcePaths)
         {

External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibraryContent.cs

@@ -92,8 +92,7 @@ public static void RegenerateLibraryContent()
         {
             standardControlsTree = GenerateControlsItemsTree();
             standardControlsTreeNoEditor = new List<TreeViewItem>();
-            var controlsItemsTree = GenerateControlsItemsTree();
-            foreach (var item in controlsItemsTree)
+            foreach (var item in standardControlsTree)
             {
                 var builderLibraryTreeItem = item.data;
                 if (builderLibraryTreeItem.isEditorOnly)

ModuleOverrides/com.unity.ui/Core/Clickable.cs

@@ -120,14 +120,14 @@ protected override void RegisterCallbacksOnTarget()
         {
             target.RegisterCallback<MouseDownEvent>(OnMouseDown, invokePolicy);
             target.RegisterCallback<MouseMoveEvent>(OnMouseMove, invokePolicy);
-            target.RegisterCallback<MouseUpEvent>(OnMouseUp, invokePolicy);
-            target.RegisterCallback<MouseCaptureOutEvent>(OnMouseCaptureOut, invokePolicy);
+            target.RegisterCallback<MouseUpEvent>(OnMouseUp, InvokePolicy.IncludeDisabled);
+            target.RegisterCallback<MouseCaptureOutEvent>(OnMouseCaptureOut, InvokePolicy.IncludeDisabled);
 
             target.RegisterCallback<PointerDownEvent>(OnPointerDown, invokePolicy);
             target.RegisterCallback<PointerMoveEvent>(OnPointerMove, invokePolicy);
-            target.RegisterCallback<PointerUpEvent>(OnPointerUp, invokePolicy);
-            target.RegisterCallback<PointerCancelEvent>(OnPointerCancel, invokePolicy);
-            target.RegisterCallback<PointerCaptureOutEvent>(OnPointerCaptureOut, invokePolicy);
+            target.RegisterCallback<PointerUpEvent>(OnPointerUp, InvokePolicy.IncludeDisabled);
+            target.RegisterCallback<PointerCancelEvent>(OnPointerCancel, InvokePolicy.IncludeDisabled);
+            target.RegisterCallback<PointerCaptureOutEvent>(OnPointerCaptureOut, InvokePolicy.IncludeDisabled);
         }
 
         /// <summary>

ModuleOverrides/com.unity.ui/Core/Controls/BaseTreeView.cs

@@ -328,11 +328,8 @@ public bool TryRemoveItem(int id)
         internal override void OnViewDataReady()
         {
             base.OnViewDataReady();
-            if (viewController != null)
-            {
-                viewController.RebuildTree();
-                RefreshItems();
-            }
+            viewController?.RebuildTree();
+            RefreshItems();
         }
 
         private void OnScrollViewKeyDown(KeyDownEvent evt)

ModuleOverrides/com.unity.ui/Core/Controls/BaseVerticalCollectionView.cs

@@ -1455,7 +1455,7 @@ protected override void ExecuteDefaultAction(EventBase evt)
             // and set it back in Setup().
             else if (evt.eventTypeId == FocusEvent.TypeId())
             {
-                m_VirtualizationController.OnFocus(evt.leafTarget as VisualElement);
+                m_VirtualizationController?.OnFocus(evt.leafTarget as VisualElement);
             }
             else if (evt.eventTypeId == NavigationSubmitEvent.TypeId())
             {

ModuleOverrides/com.unity.ui/Core/GameObjects/PanelSettings.cs

@@ -152,6 +152,11 @@ private void DisposeRelatedPanel()
             {
                 UIElementsRuntimeUtility.DisposeRuntimePanel(m_Settings);
             }
+
+            internal void MarkPotentiallyEmpty()
+            {
+                UIElementsRuntimeUtility.MarkPotentiallyEmpty(m_Settings);
+            }
         }
 
 
@@ -475,6 +480,7 @@ internal static void SetupLiveReloadPanelTrackers(bool isLiveReloadOn)
         private Rect m_TargetRect;
         private float m_ResolvedScale; // panel scaling factor (pixels <-> points)
 
+        internal int m_EmptyPanelCounter = 0;
         private PanelSettings()
         {
             m_PanelAccess = new RuntimePanelAccess(this);
@@ -517,6 +523,11 @@ private void OnDisable()
             m_PanelAccess.DisposePanel();
         }
 
+        internal void DisposePanel()
+        {
+            m_PanelAccess.DisposePanel();
+        }
+
         private void ApplyThemeStyleSheet(VisualElement root = null)
         {
             if (!m_PanelAccess.isInitialized)
@@ -705,10 +716,7 @@ internal void DetachUIDocument(UIDocument uiDocument)
             m_AttachedUIDocumentsList.RemoveFromListAndFromVisualTree(uiDocument);
 
             if (m_AttachedUIDocumentsList.m_AttachedUIDocuments.Count == 0)
-            {
-                // No references to the panel, we can dispose it and it'll be recreated if it's used again.
-                m_PanelAccess.DisposePanel();
-            }
+                m_PanelAccess.MarkPotentiallyEmpty();
         }
 
         private float m_OldReferenceDpi;