Unity 6000.0.49f1 C# reference source code

Author: Unity Technologies

Editor/Mono/Animation/AnimationWindow/CurveEditorWindow.cs

@@ -30,12 +30,13 @@ public enum NormalizationMode
  }
 
  //const int kToolbarHeight = 17;
- const int kPresetsHeight = 46;
+ const int kPresetsHeight = 50;
 
  static CurveEditorWindow s_SharedCurveEditor;
 
  internal CurveEditor m_CurveEditor;
 
+ Vector2 m_PresetScrollPosition;
  AnimationCurve m_Curve;
  Color m_Color;
 
@@ -469,20 +470,38 @@ void OnGUI()
  m_CurveEditor.OnGUI();
 
  // Preset swatch area
- GUI.Box(new Rect(0, position.height - kPresetsHeight, position.width, kPresetsHeight), "", ms_Styles.curveSwatchArea);
+ var presetRect = new Rect(0, position.height - kPresetsHeight, position.width, kPresetsHeight);
+ GUI.Box(presetRect, "", ms_Styles.curveSwatchArea);
+
  Color curveColor = m_Color;
  curveColor.a *= 0.6f;
- const float margin = 45f;
  const float width = 40f;
  const float height = 25f;
- float yPos = position.height - kPresetsHeight + (kPresetsHeight - height) * 0.5f;
+ const float spaceBetweenSwatches = 5f;
+ const float presetDropdownSize = 16f;
+ const float horizontalScrollbarHeight = 15f;
+ const float presetDropdownCenteringOffset = 2f;
+ float yPos = (kPresetsHeight - height) * 0.5f;
  InitCurvePresets();
  CurvePresetLibrary curveLibrary = m_CurvePresets.GetPresetLibraryEditor().GetCurrentLib();
  if (curveLibrary != null)
  {
- for (int i = 0; i < curveLibrary.Count(); i++)
+ var numPresets = curveLibrary.Count();
+ var presetDropDownRect = new Rect(spaceBetweenSwatches, yPos + presetDropdownCenteringOffset, presetDropdownSize, presetDropdownSize);
+ Rect contentRect = new Rect(0, 0, numPresets * (width + spaceBetweenSwatches) + presetDropDownRect.xMax, presetRect.height - horizontalScrollbarHeight);
+ m_PresetScrollPosition = GUI.BeginScrollView(
+ presetRect, // Rectangle of the visible area
+ m_PresetScrollPosition, // Current scroll position
+ contentRect, // Rectangle containing all content
+ false, // Always show horizontal scrollbar
+ false // Always show vertical scrollbar
+ );
+
+ PresetDropDown(presetDropDownRect);
+
+ Rect swatchRect = new Rect(presetDropDownRect.xMax + spaceBetweenSwatches, yPos, width, height);
+ for (int i = 0; i < numPresets; i++)
  {
- Rect swatchRect = new Rect(margin + (width + 5f) * i, yPos, width, height);
  m_GUIContent.tooltip = curveLibrary.GetName(i);
  if (GUI.Button(swatchRect, m_GUIContent, ms_Styles.curveSwatch))
  {
@@ -496,14 +515,11 @@ void OnGUI()
  if (Event.current.type == EventType.Repaint)
  curveLibrary.Draw(swatchRect, i);
 
- if (swatchRect.xMax > position.width - 2 * margin)
- break;
+ swatchRect.x += width + spaceBetweenSwatches;
  }
+ GUI.EndScrollView();
  }
 
- Rect presetDropDownButtonRect = new Rect(margin - 20f, yPos + 5f, 20, 20);
- PresetDropDown(presetDropDownButtonRect);
-
  // For adding default preset curves
  //if (EditorGUI.DropdownButton(new Rect (position.width -26, yPos, 20, 20), GUIContent.none, FocusType.Passive, "OL Plus"))
  // AddDefaultPresetsToCurrentLib ();

Editor/Mono/BuildPipeline.bindings.cs

@@ -703,6 +703,9 @@ public static string GetPlaybackEngineDirectory(BuildTargetGroup buildTargetGrou
  [FreeFunction(IsThreadSafe = true)]
  public static extern string GetPlaybackEngineDirectory(BuildTargetGroup buildTargetGroup, BuildTarget target, BuildOptions options, bool assertUnsupportedPlatforms);
 
+ [FreeFunction]
+ internal static extern bool IsServerBuildPlatformSupported(BuildTarget target);
+
  internal static string GetBuildToolsDirectory(BuildTarget target)
  {
  return Path.Combine(GetPlaybackEngineDirectory(target, BuildOptions.None, false), "Tools");

Editor/Mono/BuildPlayerWindow.cs

@@ -491,59 +491,16 @@ void OnGUI()
  {
  styles = new Styles();
  }
-
- if (!UnityConnect.instance.canBuildWithUPID)
- {
- ShowAlert();
- }
- GUILayout.Space(5);
- GUILayout.BeginHorizontal();
- GUILayout.Space(10);
- GUILayout.BeginVertical();
-
- string message = "";
- var buildSettingsLocked = !AssetDatabase.IsOpenForEdit(kEditorBuildSettingsPath, out message, StatusQueryOptions.UseCachedIfPossible);
-
- using (new EditorGUI.DisabledScope(buildSettingsLocked))
- {
- ActiveScenesGUI();
- // Clear all and Add Current Scene
- GUILayout.BeginHorizontal();
- if (buildSettingsLocked)
- {
- GUI.enabled = true;
- if (GUILayout.Button(styles.checkOut))
- AssetDatabase.MakeEditable(kEditorBuildSettingsPath);
- GUILayout.Label(message);
- GUI.enabled = false;
- }
- GUILayout.FlexibleSpace();
- if (GUILayout.Button(styles.addOpenSource))
- AddOpenScenes();
- GUILayout.EndHorizontal();
- }
-
- GUILayout.Space(10);
-
- GUILayout.BeginHorizontal(GUILayout.Height(400));
- ActiveBuildTargetsGUI();
- GUILayout.Space(10);
- GUILayout.BeginVertical();
- ShowBuildTargetSettings();
- GUILayout.EndVertical();
- GUILayout.EndHorizontal();
-
- GUILayout.Space(10);
- GUILayout.EndVertical();
- GUILayout.Space(10);
- GUILayout.EndHorizontal();
+ // Override the 'old' build settings window in favor of the new build profile window.
+ BuildPipeline.ShowBuildProfileWindow();
+ Close();
  }
 
  static bool IsAnyStandaloneModuleLoaded()
  {
  return ModuleManager.IsPlatformSupportLoadedByBuildTarget(BuildTarget.StandaloneLinux64) ||
- ModuleManager.IsPlatformSupportLoadedByBuildTarget(BuildTarget.StandaloneOSX) ||
- ModuleManager.IsPlatformSupportLoadedByBuildTarget(BuildTarget.StandaloneWindows);
+  ModuleManager.IsPlatformSupportLoadedByBuildTarget(BuildTarget.StandaloneOSX) ||
+  ModuleManager.IsPlatformSupportLoadedByBuildTarget(BuildTarget.StandaloneWindows);
  }
 
  static bool IsVirtualTexturingSettingsValid(BuildPlatform platform)

Editor/Mono/BuildProfile/BuildProfileContext.cs

@@ -65,12 +65,7 @@ internal static BuildProfile activeProfile
  {
  get
  {
- // Active Build profile may be deleted from the project.
- var activeProfile = EditorUserBuildSettings.activeBuildProfile;
- if (activeProfile != null && activeProfile.CanBuildLocally())
- return activeProfile;
-
- return null;
+ return EditorUserBuildSettings.activeBuildProfile;
  }
 
  set

Editor/Mono/BuildTargetDiscovery.bindings.cs

@@ -586,66 +586,17 @@ static void PreloadBuildPlatformInstalledData()
  }
 
  bool isInstalled = false;
- if (platform.Value.HasFlag(PlatformAttributes.IsWindowsServerBuildTarget))
- {
- var serverVariations = new[]
- {
- "win32_server_development",
- "win32_server_nondevelopment",
- "win64_server_development",
- "win64_server_nondevelopment",
- "win_arm64_server_development",
- "win_arm64_server_nondevelopment",
- };
- isInstalled = VariationPresent(serverVariations, playbackEngineDirectory);
- }
- else if (platform.Value.HasFlag(PlatformAttributes.IsLinuxServerBuildTarget))
- {
- var serverVariations = new[]
- {
- "linux64_server_development",
- "linux64_server_nondevelopment",
- };
- isInstalled = VariationPresent(serverVariations, playbackEngineDirectory);
- }
- else if (platform.Value.HasFlag(PlatformAttributes.IsMacServerBuildTarget))
- {
- var serverVariations = new[]
- {
- "macos_x64_server_development",
- "macos_x64_server_nondevelopment",
- "macos_arm64_server_development",
- "macos_arm64_server_nondevelopment",
- "macos_x64arm64_server_development",
- "macos_x64arm64_server_nondevelopment",
- };
- isInstalled = VariationPresent(serverVariations, playbackEngineDirectory);
- }
+ if (platform.Value.HasFlag(PlatformAttributes.IsWindowsServerBuildTarget) ||
+ platform.Value.HasFlag(PlatformAttributes.IsLinuxServerBuildTarget) ||
+ platform.Value.HasFlag(PlatformAttributes.IsMacServerBuildTarget))
+ isInstalled = BuildPipeline.IsServerBuildPlatformSupported(platform.Value.buildTarget);
  else
  isInstalled = true;
 
  k_PlatformInstalledData.Add(platform.Key, isInstalled);
  }
  }
 
- static bool VariationPresent(string[] variations, string playbackEngineDirectory)
- {
- if (string.IsNullOrEmpty(playbackEngineDirectory))
- return false;
-
- var scriptingBackends = new[] { "mono", "il2cpp", "coreclr" };
- foreach (var variation in variations)
- {
- foreach (var backend in scriptingBackends)
- {
- if (Directory.Exists(Paths.Combine(playbackEngineDirectory, "Variations", variation + "_" + backend)))
- return true;
- }
- }
-
- return false;
- }
-
  [System.Obsolete("BuildPlatformIsInstalled(BuildTarget) is obsolete. Use BuildPlatformIsInstalled(IBuildTarget) instead.", false)]
  public static bool BuildPlatformIsInstalled(BuildTarget platform) => BuildPlatformIsInstalled(GetGUIDFromBuildTarget(platform));
 

Editor/Mono/ConsoleWindow.cs

@@ -739,6 +739,7 @@ const bool
  {
  SetActiveEntry(entry);
  m_LastActiveEntryIndex = entry.globalLineIndex;
+ m_TextScroll = Vector2.zero;
  activeEntryChanged?.Invoke();
  }
 

Editor/Mono/ContainerWindow.bindings.cs

@@ -70,10 +70,6 @@ extern Rect Internal_Position
  [FreeFunction(k_ScriptingPrefix + "MoveBehindOf", HasExplicitThis = true)]
  public extern void MoveBehindOf(ContainerWindow other);
 
- // Fit a container window to the screen.
- [FreeFunction(k_ScriptingPrefix + "FitWindowRectToScreen", HasExplicitThis = true)]
- public extern Rect FitWindowRectToScreen(Rect r, bool forceCompletelyVisible, bool useMouseScreen);
-
  [FreeFunction(k_ScriptingPrefix + "SendCaptionEvent", HasExplicitThis = true)]
  public extern void SendCaptionEvent(bool mouseDown);
 
@@ -108,7 +104,11 @@ extern Rect Internal_Position
  [FreeFunction(k_ScriptingPrefix + "GetOrderedWindowList")]
  internal static extern void GetOrderedWindowList();
 
+ [FreeFunction(k_ScriptingPrefix + "FitRectToMouseScreen")]
+ internal static extern Rect FitRectToMouseScreen(Rect rect, bool forceCompletelyVisible, ContainerWindow windowForBorderCalculation);
+
  [FreeFunction(k_ScriptingPrefix + "FitRectToScreen")]
- internal static extern Rect FitRectToScreen(Rect defaultRect, bool forceCompletelyVisible, bool useMouseScreen);
+ internal static extern Rect FitRectToScreen(Rect rect, Vector2 uiPositionToFindScreen, bool forceCompletelyVisible, ContainerWindow windowForBorderCalculation);
+
  }
 }

Editor/Mono/ContainerWindow.cs

@@ -149,7 +149,7 @@ internal void ShowPopupWithMode(ShowMode mode, bool giveFocus)
  Internal_BringLiveAfterCreation(true, giveFocus, false);
 
  // Fit window to screen - needs to be done after bringing the window live
- position = FitWindowRectToScreen(m_PixelRect, true, false);
+ position = FitRectToScreen(m_PixelRect, m_PixelRect.center, true, this);
  rootView.position = new Rect(0, 0, GUIUtility.RoundToPixelGrid(m_PixelRect.width), GUIUtility.RoundToPixelGrid(m_PixelRect.height));
  rootView.Reflow();
  }
@@ -231,7 +231,11 @@ public void Show(ShowMode showMode, bool loadPosition, bool displayImmediately,
 
  internal void FitWindowToScreen(bool useMousePos)
  {
- position = FitWindowRectToScreen(m_PixelRect, true, useMousePos);
+ if (useMousePos)
+ position = FitRectToMouseScreen(m_PixelRect, true, this);
+ else
+ position = FitRectToScreen(m_PixelRect, m_PixelRect.center, true, this);
+
  if (rootView)
  rootView.position = new Rect(0, 0, GUIUtility.RoundToPixelGrid(m_PixelRect.width), GUIUtility.RoundToPixelGrid(m_PixelRect.height));
  }

Editor/Mono/EditorGUI.cs

@@ -2011,12 +2011,11 @@ public ScrollableAreaScope(int id, ref Rect position, string text, ref Vector2 s
  this.style = style;
  this.scrollPosition = scrollPosition;
 
+ position = IndentedRect(position);
  float fullTextHeight = style.CalcHeight(GUIContent.Temp(text), position.width);
  Rect viewRect = new Rect(0, 0, position.width, fullTextHeight);
 
  oldScrollValue = style.contentOffset;
-
- position = IndentedRect(position);
  if (position.height < viewRect.height)
  {
  //Scroll bar position
@@ -2081,7 +2080,23 @@ internal static void ScrollableLabelAreaInternal(Rect position, string text, ref
 
  RecycledTextEditor.s_AllowContextCutOrPaste = false;
  if (sendEventToTextEditor)
+ {
+ bool isMouseDown = Event.current.rawType == EventType.MouseDown && Event.current.button == 0;
+ bool isEditingControl = s_RecycledEditor.IsEditingControl(id);
+
  DoTextField(s_RecycledEditor, id, position, text, style, string.Empty, out _, false, true, false);
+
+ if (isMouseDown && Event.current.type == EventType.Used)
+ {
+ // We just took control over the Scrollable label
+ if (!isEditingControl && s_RecycledEditor.IsEditingControl(id))
+ {
+ // Properly set the scroll offset as it was set to 0 in the editor.BeginEditing
+ // Move the recycled Editor offset to match our scrollbar
+ s_RecycledEditor.scrollOffset = scrollPosition;
+ }
+ }
+ }
  }
 
  //Only update the out scrollPosition if the user has interacted with the TextArea (the current event was used)

Editor/Mono/EditorWindow.cs

@@ -120,6 +120,9 @@ internal SerializableJsonDictionary viewDataDictionary
  }
  }
 
+ // This list contains all the editor windows that are already enabled/active/alive.
+ // It is important to check if your window is contained in this list before doing anything,
+ // such like UI build/rebuild.
  internal static List<EditorWindow> activeEditorWindows { get; } = new List<EditorWindow>();
 
  internal void SaveViewData()
@@ -1258,7 +1261,7 @@ public Rect position
  if (!da)
  {
  if(m_Parent.window.showMode == ShowMode.Tooltip || m_Parent.window.showMode == ShowMode.PopupMenu)
- m_Parent.window.position = m_Parent.window.FitWindowRectToScreen(value, true, false);
+ m_Parent.window.position = ContainerWindow.FitRectToScreen(value, value.center, true, m_Parent.window);
  else
  m_Parent.window.position = value;
  m_Parent.window.OnResize();