Unity 2017.2.2p2 C# reference source code

Unity Technologies · Unity Technologies · commit 27d180781994 · 2018-03-23T13:33:23.000Z
diff --git a/Editor/Mono/EditorGUI.cs b/Editor/Mono/EditorGUI.cs
@@ -663,14 +663,19 @@ internal static string DoTextField(RecycledTextEditor editor, int id, Rect posit
                     editor.isPasswordField = passwordField;
                     editor.DetectFocusChange();
                 }
-                else if (s_DragCandidateState == 0)
+                else if (EditorGUIUtility.editingTextField || (evt.GetTypeForControl(id) == EventType.ExecuteCommand && evt.commandName == "NewKeyboardFocus"))
                 {
                     // This one is worse: we are the new keyboardControl, but didn't know about it.
                     // this means a Tab operation or setting focus from code.
                     editor.BeginEditing(id, text, position, style, multiline, passwordField);
                     // If cursor is invisible, it's a selectable label, and we don't want to select all automatically
                     if (GUI.skin.settings.cursorColor.a > 0)
                         editor.SelectAll();
+
+                    if (evt.GetTypeForControl(id) == EventType.ExecuteCommand)
+                    {
+                        evt.Use();
+                    }
                 }
             }
 
diff --git a/Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsEditor.cs b/Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsEditor.cs
@@ -1971,7 +1971,7 @@ private ApiCompatibilityLevel[] GetAvailableApiCompatibilityLevels(BuildTargetGr
             if (EditorApplication.scriptingRuntimeVersion == ScriptingRuntimeVersion.Latest)
                 return only_4_x_profiles;
 
-            if (activeBuildTargetGroup == BuildTargetGroup.WSA || activeBuildTargetGroup == BuildTargetGroup.XboxOne)
+            if (activeBuildTargetGroup == BuildTargetGroup.WSA)
                 return allProfiles;
 
             return only_2_0_profiles;
diff --git a/Projects/CSharp/UnityEngine.csproj b/Projects/CSharp/UnityEngine.csproj
@@ -84,6 +84,9 @@
 <Compile Include="..\..\Runtime\Export\UnitySynchronizationContext.cs" >
 <Link>Runtime\Export\UnitySynchronizationContext.cs</Link>
 </Compile>
+<Compile Include="..\..\Runtime\Export\Caching.deprecated.cs" >
+<Link>Runtime\Export\Caching.deprecated.cs</Link>
+</Compile>
 <Compile Include="..\..\Runtime\Export\Random.cs" >
 <Link>Runtime\Export\Random.cs</Link>
 </Compile>
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-## Unity 2017.2.2p1 C# reference source code
+## Unity 2017.2.2p2 C# reference source code
 
 The C# part of the Unity engine and editor source code.
 May be used for reference purposes only.
diff --git a/Runtime/Export/Caching.deprecated.cs b/Runtime/Export/Caching.deprecated.cs
@@ -0,0 +1,18 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+
+namespace UnityEngine
+{
+
+    public partial class Caching
+    {
+        [System.Obsolete("This function is obsolete. Please use ClearCache.  (UnityUpgradable) -> ClearCache()")]
+        public static bool CleanCache()
+        {
+            return ClearCache();
+        }
+    }
+}
diff --git a/Runtime/UIElements/Managed/IMGUIContainer.cs b/Runtime/UIElements/Managed/IMGUIContainer.cs
@@ -29,6 +29,7 @@ private GUILayoutUtility.LayoutCache cache
         public ContextType contextType { get; set; }
         internal int GUIDepth { get; private set; }
 
+        int newKeyboardFocusControlID = 0;
         internal Matrix4x4 imguiTransform
         {
             get
@@ -148,7 +149,11 @@ private bool DoOnGUI(Event evt)
                 }
             }
 
-            GUIUtility.CheckForTabEvent(evt);
+            int focusBefore = GUIUtility.keyboardControl;
+            if (GUIUtility.CheckForTabEvent(evt) && GUIUtility.keyboardControl != focusBefore)
+            {
+                newKeyboardFocusControlID = GUIUtility.keyboardControl;
+            }
 
             // The Event will probably be nuked with the next function call, so we get its type now.
             EventType eventType = Event.current.type;
@@ -216,6 +221,17 @@ public override void HandleEvent(EventBase evt)
             evt.imguiEvent.type = originalEventType;
             ret |= DoOnGUI(evt.imguiEvent);
 
+            if (newKeyboardFocusControlID > 0)
+            {
+                newKeyboardFocusControlID = 0;
+                Event focusCommand = new Event();
+                focusCommand.type = EventType.Layout;
+                DoOnGUI(focusCommand);
+                focusCommand.type = EventType.ExecuteCommand;
+                focusCommand.commandName = "NewKeyboardFocus";
+                DoOnGUI(focusCommand);
+            }
+
             if (ret)
             {
                 evt.StopPropagation();

Original file line number	Diff line number	Diff line change
`@@ -663,14 +663,19 @@ internal static string DoTextField(RecycledTextEditor editor, int id, Rect posit`
`663`	`663`	`editor.isPasswordField = passwordField;`
`664`	`664`	`editor.DetectFocusChange();`
`665`	`665`	`}`
`666`		`- else if (s_DragCandidateState == 0)`
	`666`	`+ else if (EditorGUIUtility.editingTextField \|\| (evt.GetTypeForControl(id) == EventType.ExecuteCommand && evt.commandName == "NewKeyboardFocus"))`
`667`	`667`	`{`
`668`	`668`	`// This one is worse: we are the new keyboardControl, but didn't know about it.`
`669`	`669`	`// this means a Tab operation or setting focus from code.`
`670`	`670`	`editor.BeginEditing(id, text, position, style, multiline, passwordField);`
`671`	`671`	`// If cursor is invisible, it's a selectable label, and we don't want to select all automatically`
`672`	`672`	`if (GUI.skin.settings.cursorColor.a > 0)`
`673`	`673`	`editor.SelectAll();`
	`674`	`+`
	`675`	`+ if (evt.GetTypeForControl(id) == EventType.ExecuteCommand)`
	`676`	`+ {`
	`677`	`+ evt.Use();`
	`678`	`+ }`
`674`	`679`	`}`
`675`	`680`	`}`
`676`	`681`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-## Unity 2017.2.2p1 C# reference source code`
	`1`	`+## Unity 2017.2.2p2 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.`