Unity 2020.1.0a16 C# reference source code

Author: Unity Technologies

Editor/Mono/Animation/AnimationWindow/AddCurvesPopupHierarchyGUI.cs

@@ -14,7 +14,8 @@ internal class AddCurvesPopupHierarchyGUI : TreeViewGUI
     {
         public EditorWindow owner;
         public bool showPlusButton { get; set; }
-        private GUIStyle plusButtonStyle = "OL Plus";
+        private GUIStyle buttonStyle = "IconButton";
+        private GUIContent plusIcon = EditorGUIUtility.TrIconContent("Toolbar Plus");
         private GUIStyle plusButtonBackgroundStyle = "Tag MenuItem";
         private GUIContent addPropertiesContent = EditorGUIUtility.TrTextContent("Add Properties");
         private const float plusButtonWidth = 17;
@@ -48,7 +49,7 @@ public override void OnRowGUI(Rect rowRect, TreeViewItem node, int row, bool sel
 
             if (propertyPathMismatchWithHumanAvatar)
             {
-                Rect iconRect = new Rect(rowRect.width - plusButtonWidth, rowRect.yMin, plusButtonWidth, plusButtonStyle.fixedHeight);
+                Rect iconRect = new Rect(rowRect.width - plusButtonWidth, rowRect.yMin, plusButtonWidth, buttonStyle.fixedHeight);
                 GUI.Label(iconRect, new GUIContent(warningIcon, "The Avatar definition does not match the property path. Please author using a hierarchy the Avatar was built with."), warningIconStyle);
             }
         }
@@ -60,14 +61,14 @@ private void DoAddCurveButton(Rect rowRect, TreeViewItem node)
             if (hierarchyNode == null || hierarchyNode.curveBindings == null || hierarchyNode.curveBindings.Length == 0)
                 return;
 
-            Rect buttonRect = new Rect(rowRect.width - plusButtonWidth, rowRect.yMin, plusButtonWidth, plusButtonStyle.fixedHeight);
+            Rect buttonRect = new Rect(rowRect.width - plusButtonWidth, rowRect.yMin, plusButtonWidth, buttonStyle.fixedHeight);
 
             // TODO Make a style for add curves popup
             // Draw background behind plus button to prevent text overlapping
             GUI.Box(buttonRect, GUIContent.none, plusButtonBackgroundStyle);
 
             // Check if the curve already exists and remove plus button
-            if (GUI.Button(buttonRect, GUIContent.none, plusButtonStyle))
+            if (GUI.Button(buttonRect, plusIcon, buttonStyle))
             {
                 AddCurvesPopup.AddNewCurve(hierarchyNode);
 

Editor/Mono/Animation/ZoomableArea.cs

@@ -753,10 +753,11 @@ void SliderGUI()
                     }
                     min = shownXMin;
                     max = shownXMin + shownXRange;
+                    float rectWidthWithinMargins = GetWidthInsideMargins(rect.width, true);
                     if (min > area.xMin)
-                        min = Mathf.Min(min, max - rect.width / m_HScaleMax);
+                        min = Mathf.Min(min, max - rectWidthWithinMargins / m_HScaleMax);
                     if (max < area.xMax)
-                        max = Mathf.Max(max, min + rect.width / m_HScaleMax);
+                        max = Mathf.Max(max, min + rectWidthWithinMargins / m_HScaleMax);
                     SetShownHRangeInsideMargins(min, max);
                 }
 
@@ -787,10 +788,11 @@ void SliderGUI()
                         }
                         min = -(shownYMin + shownYRange);
                         max = -shownYMin;
+                        float rectHeightWithinMargins = GetHeightInsideMargins(rect.height, true);
                         if (min > area.yMin)
-                            min = Mathf.Min(min, max - rect.height / m_VScaleMax);
+                            min = Mathf.Min(min, max - rectHeightWithinMargins / m_VScaleMax);
                         if (max < area.yMax)
-                            max = Mathf.Max(max, min + rect.height / m_VScaleMax);
+                            max = Mathf.Max(max, min + rectHeightWithinMargins / m_VScaleMax);
                         SetShownVRangeInsideMargins(min, max);
                     }
                     else
@@ -816,10 +818,11 @@ void SliderGUI()
                         }
                         min = shownYMin;
                         max = shownYMin + shownYRange;
+                        float rectHeightWithinMargins = GetHeightInsideMargins(rect.height, true);
                         if (min > area.yMin)
-                            min = Mathf.Min(min, max - rect.height / m_VScaleMax);
+                            min = Mathf.Min(min, max - rectHeightWithinMargins / m_VScaleMax);
                         if (max < area.yMax)
-                            max = Mathf.Max(max, min + rect.height / m_VScaleMax);
+                            max = Mathf.Max(max, min + rectHeightWithinMargins / m_VScaleMax);
                         SetShownVRangeInsideMargins(min, max);
                     }
                 }

Editor/Mono/AssemblyInfo/AssemblyInfo.cs

@@ -111,6 +111,10 @@
 [assembly: InternalsVisibleTo("Unity.2D.Tilemap.Editor")]
 [assembly: InternalsVisibleTo("Unity.2D.Tilemap.EditorTests")]
 [assembly: InternalsVisibleTo("Unity.PackageCleanConsoleTest.Editor")]
+[assembly: InternalsVisibleTo("Unity.UIElements")]
+[assembly: InternalsVisibleTo("Unity.UIElements.Editor")]
+[assembly: InternalsVisibleTo("Unity.UIElements.Tests")]
+[assembly: InternalsVisibleTo("Unity.UIElements.EditorTests")]
 [assembly: InternalsVisibleTo("Unity.SceneTemplate.Editor")]
 
 [assembly: AssemblyIsEditorAssembly]

Editor/Mono/AssemblyValidation.cs

@@ -388,6 +388,17 @@ public static void ResolveAndSetupReferences(int index,
                     if (assemblyDefinitionNameToIndex.TryGetValue(referenceAssemblyDefinition.Name.Name,
                         out referenceAssemblyDefinitionIndex))
                     {
+                        bool isSigned = IsSigned(reference);
+                        if (isSigned)
+                        {
+                            var definition = assemblyDefinitions[referenceAssemblyDefinitionIndex];
+                            if (definition.Name.Version.ToString() != reference.Version.ToString())
+                            {
+                                errors[index].Add(ErrorFlags.UnresolvableReference,
+                                    $"{assemblyDefinition.Name.Name} references strong named {reference.Name}, versions has to match. Assembly references: {reference.Version} Found in project: {definition.Name.Version}.");
+                            }
+                        }
+
                         referenceIndieces.Add(referenceAssemblyDefinitionIndex);
                     }
                 }
@@ -402,6 +413,19 @@ public static void ResolveAndSetupReferences(int index,
             assemblyAndReferences[index].referenceIndicies = referenceIndieces.ToArray();
         }
 
+        private static bool IsSigned(AssemblyNameReference reference)
+        {
+            //Bug in Cecil where HasPublicKey is always false
+            foreach (var publicTokenByte in reference.PublicKeyToken)
+            {
+                if (publicTokenByte != 0)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
         public static AssemblyNameReference[] GetAssemblyNameReferences(AssemblyDefinition assemblyDefinition)
         {
             List<AssemblyNameReference> result = new List<AssemblyNameReference>

Editor/Mono/ContainerWindow.cs

@@ -471,7 +471,7 @@ private void DragTitleBar(Rect titleBarRect)
                     // If the mouse is inside the title bar rect, we say that we're the hot control
                     if (titleBarRect.Contains(evt.mousePosition) && GUIUtility.hotControl == 0 && evt.button == 0)
                     {
-                        if (Application.platform == RuntimePlatform.WindowsEditor)
+                        if (Application.platform != RuntimePlatform.LinuxEditor)
                         {
                             Event.current.Use();
                             m_DraggingNativeTitleBarCaption = true;

Editor/Mono/EditorApplication.cs

@@ -179,7 +179,7 @@ public static void DirtyHierarchyWindowSorting()
 
         public static event Action quitting;
 
-        public static event Action delayCall;
+        public static CallbackFunction delayCall;
 
         // Each time an object is (or a group of objects are) created, renamed, parented, unparented or destroyed this callback is raised.
         public static event Action hierarchyChanged;
@@ -319,7 +319,7 @@ static void Internal_CallUpdateFunctions()
 
         static void Internal_CallDelayFunctions()
         {
-            var delay = delayCall;
+            CallbackFunction delay = delayCall;
             delayCall = null;
 
             if (delay != null)

Editor/Mono/EditorGUI.cs

@@ -1390,7 +1390,7 @@ internal static Rect GetInspectorTitleBarObjectFoldoutRenderRect(Rect rect)
 
         internal static Rect GetInspectorTitleBarObjectFoldoutRenderRect(Rect rect, GUIStyle baseStyle)
         {
-            return new Rect(rect.x + EditorStyles.foldout.margin.left + 1f, rect.y + (rect.height - kInspTitlebarFoldoutIconWidth) / 2 + (baseStyle != null ? baseStyle.padding.top : 0), kInspTitlebarFoldoutIconWidth, kInspTitlebarFoldoutIconWidth);
+            return new Rect(rect.x + EditorStyles.titlebarFoldout.margin.left + 1f, rect.y + (rect.height - kInspTitlebarFoldoutIconWidth) / 2 + (baseStyle != null ? baseStyle.padding.top : 0), kInspTitlebarFoldoutIconWidth, kInspTitlebarFoldoutIconWidth);
         }
 
         [SuppressMessage("ReSharper", "RedundantCast.0")]
@@ -1559,7 +1559,7 @@ private static void DoObjectFoldoutInternal(bool foldout, Rect renderRect, int i
             {
                 case EventType.Repaint:
                     bool isPressed = GUIUtility.hotControl == id;
-                    EditorStyles.foldout.Draw(renderRect, isPressed, isPressed, foldout, false);
+                    EditorStyles.titlebarFoldout.Draw(renderRect, isPressed, isPressed, foldout, false);
                     break;
             }
 
@@ -5325,7 +5325,7 @@ internal static bool ToggleTitlebar(Rect position, GUIContent label, bool foldou
 
             GUIStyle baseStyle = EditorStyles.inspectorTitlebar;
             GUIStyle textStyle = EditorStyles.inspectorTitlebarText;
-            GUIStyle foldoutStyle = EditorStyles.foldout;
+            GUIStyle foldoutStyle = EditorStyles.titlebarFoldout;
 
             Rect toggleRect = new Rect(position.x + baseStyle.padding.left, position.y + baseStyle.padding.top, kInspTitlebarIconWidth, kInspTitlebarIconWidth);
             Rect textRect = new Rect(toggleRect.xMax + kInspTitlebarSpacing, toggleRect.y, 200, kInspTitlebarIconWidth);
@@ -5373,7 +5373,7 @@ internal static bool FoldoutTitlebar(Rect position, GUIContent label, bool foldo
 
                     break;
                 case EventType.Repaint:
-                    GUIStyle foldoutStyle = EditorStyles.foldout;
+                    GUIStyle foldoutStyle = EditorStyles.titlebarFoldout;
                     Rect textRect =
                         new Rect(
                             position.x + baseStyle.padding.left +

Editor/Mono/EditorGUIUtility.bindings.cs

@@ -156,7 +156,7 @@ public static void RenderGameViewCameras(RenderTexture target, int targetDisplay
         private static extern Texture2D FindTextureByName(string name);
         private static extern Texture2D FindTextureByType([NotNull] Type type);
         private static extern string GetObjectNameWithInfo(Object obj);
-        private static extern string GetTypeNameWithInfo(string typeName);
+        private static extern string GetTypeNameWithInfo(string typeName, int instanceID);
         private static extern void Internal_SetupEventValues(object evt);
         private static extern Vector2 Internal_GetIconSize();
         private static extern bool Internal_GetKeyboardRect(int id, out Rect rect);

Editor/Mono/EditorGUIUtility.cs

@@ -799,6 +799,11 @@ internal static void Internal_SwitchSkin()
 
         // Return a GUIContent object with the name and icon of an Object.
         public static GUIContent ObjectContent(UnityObject obj, Type type)
+        {
+            return ObjectContent(obj, type, ReferenceEquals(obj, null) ? 0 : obj.GetInstanceID());
+        }
+
+        internal static GUIContent ObjectContent(UnityObject obj, Type type, int instanceID)
         {
             if (obj)
             {
@@ -807,7 +812,7 @@ public static GUIContent ObjectContent(UnityObject obj, Type type)
             }
             else if (type != null)
             {
-                s_ObjectContent.text = GetTypeNameWithInfo(type.Name);
+                s_ObjectContent.text = GetTypeNameWithInfo(type.Name, instanceID);
                 s_ObjectContent.image = AssetPreview.GetMiniTypeThumbnail(type);
             }
             else

Editor/Mono/EditorSettings.bindings.cs

@@ -256,7 +256,7 @@ internal static extern string Internal_ProjectGenerationUserExtensions
         public static extern bool serializeInlineMappingsOnOneLine { get; set; }
 
         [StaticAccessor("GetEditorSettings()", StaticAccessorType.Dot)]
-        public static extern AssetPipelineMode assetPipelineMode { get; set; }
+        public static extern AssetPipelineMode assetPipelineMode { get; }
 
         [StaticAccessor("GetEditorSettings()", StaticAccessorType.Dot)]
         public static extern CacheServerMode cacheServerMode { get; set; }