Unity 2022.1.3f1 C# reference source code

Unity Technologies · Unity Technologies · commit ca9aafab8d75 · 2022-05-31T16:42:45.000Z
diff --git a/Editor/Mono/EditorGUI.cs b/Editor/Mono/EditorGUI.cs
@@ -315,6 +315,28 @@ public void Dispose()
             }
         }
 
+        internal class DisabledGuiViewInputScope : GUI.Scope
+        {
+            GUIView m_View;
+            bool m_WasDisabled;
+
+            public DisabledGuiViewInputScope(GUIView view, bool disabled)
+            {
+                m_View = view;
+                if (m_View != null)
+                {
+                    m_WasDisabled = view.disableInputEvents;
+                    m_View.disableInputEvents = disabled;
+                }
+            }
+
+            protected override void CloseScope()
+            {
+                if (m_View != null)
+                    m_View.disableInputEvents = m_WasDisabled;
+            }
+        }
+
         internal struct LabelHighlightScope : IDisposable
         {
             bool m_Disposed;
diff --git a/Editor/Mono/EditorUtility.bindings.cs b/Editor/Mono/EditorUtility.bindings.cs
@@ -10,6 +10,7 @@
 using UnityEngine.Scripting;
 using System.Collections.Generic;
 using System.Linq;
+using static UnityEditor.EditorGUI;
 
 namespace UnityEditor
 {
@@ -32,7 +33,15 @@ public static string OpenFilePanelWithFilters(string title, string directory, st
         public static extern void RevealInFinder(string path);
 
         [FreeFunction("DisplayDialog")]
-        public static extern bool DisplayDialog(string title, string message, string ok, [DefaultValue("\"\"")] string cancel);
+        static extern bool DoDisplayDialog(string title, string message, string ok, [DefaultValue("\"\"")] string cancel);
+
+        public static bool DisplayDialog(string title, string message, string ok, [DefaultValue("\"\"")] string cancel)
+        {
+            using (new DisabledGuiViewInputScope(GUIView.current, true))
+            {
+                return DoDisplayDialog(title, message, ok, cancel); ;
+            }
+        }
 
         [ExcludeFromDocs]
         public static bool DisplayDialog(string title, string message, string ok)
diff --git a/Editor/Mono/ProjectBrowser.cs b/Editor/Mono/ProjectBrowser.cs
@@ -2079,8 +2079,9 @@ void HandleContextClickInListArea(Rect listRect)
                     {
                         GUIUtility.hotControl = 0;
 
-                        // Only show menu if there are instances selected
-                        if (Selection.instanceIDs.Length > 0)
+                        // In safe mode non-scripts assets aren't selectable and therefore if you context click a non-script
+                        // asset, then a context menu shouldn't be displayed.
+                        if (!EditorUtility.isInSafeMode || Selection.instanceIDs.Length > 0)
                         {
                             // Context click in list area
                             EditorUtility.DisplayPopupMenu(new Rect(evt.mousePosition.x, evt.mousePosition.y, 0, 0), "Assets/", null);
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-## Unity 2022.1.2f1 C# reference source code
+## Unity 2022.1.3f1 C# reference source code
 
 The C# part of the Unity engine and editor source code.
 May be used for reference purposes only.

Original file line number	Diff line number	Diff line change
`@@ -2079,8 +2079,9 @@ void HandleContextClickInListArea(Rect listRect)`
`2079`	`2079`	`{`
`2080`	`2080`	`GUIUtility.hotControl = 0;`
`2081`	`2081`
`2082`		`- // Only show menu if there are instances selected`
`2083`		`- if (Selection.instanceIDs.Length > 0)`
	`2082`	`+ // In safe mode non-scripts assets aren't selectable and therefore if you context click a non-script`
	`2083`	`+ // asset, then a context menu shouldn't be displayed.`
	`2084`	`+ if (!EditorUtility.isInSafeMode \|\| Selection.instanceIDs.Length > 0)`
`2084`	`2085`	`{`
`2085`	`2086`	`// Context click in list area`
`2086`	`2087`	`EditorUtility.DisplayPopupMenu(new Rect(evt.mousePosition.x, evt.mousePosition.y, 0, 0), "Assets/", null);`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-## Unity 2022.1.2f1 C# reference source code`
	`1`	`+## Unity 2022.1.3f1 C# reference source code`
`2`	`2`
`3`	`3`	`The C# part of the Unity engine and editor source code.`
`4`	`4`	`May be used for reference purposes only.`