fix: Changed code according to changes in SolidUtilities

Author: SolidAlloy

Editor/Drawers/TypeFieldDrawer.cs

@@ -16,7 +16,6 @@ internal class TypeFieldDrawer
     {
         private const string MissingSuffix = " {Missing}";
         private static readonly int _controlHint = typeof(TypeReferencePropertyDrawer).GetHashCode();
-        private static readonly ContentCache _contentCache = new ContentCache();
 
         private readonly SerializedTypeReference _serializedTypeRef;
         private readonly TypeDropdownDrawer _dropdownDrawer;
@@ -119,7 +118,7 @@ private void DrawFieldContent(int controlID)
         {
             int indexOfComma = _serializedTypeRef.TypeNameAndAssembly.IndexOf(',');
             string fullTypeName = indexOfComma == -1 ? string.Empty : _serializedTypeRef.TypeNameAndAssembly.Substring(0, indexOfComma);
-            GUIContent fieldContent = _contentCache.GetItem(GetTypeToShow(fullTypeName));
+            GUIContent fieldContent = GUIContentHelper.Temp(GetTypeToShow(fullTypeName));
             EditorStyles.popup.Draw(_position, fieldContent, controlID);
         }
 

Editor/TypeDropdown/DropdownWindow.cs

@@ -86,7 +86,7 @@ private Rect GetWindowRect(Vector2 windowPosition, float windowHeight)
         {
             // If the window width is smaller than the distance from cursor to the right border of the window, the
             // window will not appear because the cursor is outside of the window and OnGUI will never be called.
-            float screenWidth = EditorDrawHelper.GetScreenWidth();
+            float screenWidth = EditorGUIUtilityHelper.GetScreenWidth();
             windowPosition.x -= 8f; // This will make the window appear so that foldout arrows are precisely below the cursor.
             float distanceToRightBorder = screenWidth - windowPosition.x;
 
@@ -101,11 +101,11 @@ private Rect GetWindowRect(Vector2 windowPosition, float windowHeight)
             const float minHeightOnStart = 100f;
             windowHeight = windowHeight < 100f ? minHeightOnStart : windowHeight;
 
-            float distanceToBottomBorder = EditorDrawHelper.GetMainWindowPosition().yMax - windowPosition.y;
+            float distanceToBottomBorder = EditorGUIUtilityHelper.GetMainWindowPosition().yMax - windowPosition.y;
 
             if (distanceToBottomBorder < windowHeight)
             {
-                windowPosition.y = EditorDrawHelper.GetMainWindowPosition().yMax - windowHeight;
+                windowPosition.y = EditorGUIUtilityHelper.GetMainWindowPosition().yMax - windowHeight;
             }
 
             var windowSize = new Vector2(distanceToRightBorder, windowHeight);
@@ -168,7 +168,7 @@ private void DrawContent()
         {
             using (new FixedRect(_preventExpandingHeight, position.width))
             {
-                using (new EditorDrawHelper.VerticalBlock(_preventExpandingHeight,
+                using (EditorGUILayoutHelper.VerticalBlock(_preventExpandingHeight,
                     DropdownStyle.BackgroundColor, out float contentHeight))
                 {
                     _selectionTree.Draw();
@@ -177,7 +177,7 @@ private void DrawContent()
                         _contentHeight = contentHeight;
                 }
 
-                EditorDrawHelper.DrawBorders(position.width, position.height, DropdownStyle.BorderColor);
+                EditorGUIHelper.DrawBorders(position.width, position.height, DropdownStyle.BorderColor);
             }
         }
 

Editor/TypeDropdown/Scrollbar.cs

@@ -64,23 +64,23 @@ private void ScrollToNode(Rect nodeRect)
         public readonly struct ScrollbarScope : IDisposable
         {
             private readonly Scrollbar _scrollbar;
-            private readonly EditorDrawHelper.VerticalBlock _outerVerticalBlock;
-            private readonly EditorDrawHelper.ScrollView _scrollView;
-            private readonly EditorDrawHelper.VerticalBlock _innerVerticalBlock;
+            private readonly EditorGUILayoutHelper.Vertical _outerVerticalBlock;
+            private readonly EditorGUILayoutHelper.ScrollView _scrollView;
+            private readonly EditorGUILayoutHelper.Vertical _innerVerticalBlock;
             private readonly Rect _newWholeListRect;
 
             public ScrollbarScope(Scrollbar scrollbar)
             {
                 _scrollbar = scrollbar;
 
-                _outerVerticalBlock = new EditorDrawHelper.VerticalBlock(out Rect windowRect);
+                _outerVerticalBlock = EditorGUILayoutHelper.VerticalBlock(out Rect windowRect);
 
                 if (Event.current.type == EventType.Repaint)
                     _scrollbar._windowRect = windowRect;
 
-                _scrollView = new EditorDrawHelper.ScrollView(ref _scrollbar._position, _scrollbar._visible);
+                _scrollView = EditorGUILayoutHelper.ScrollViewBlock(ref _scrollbar._position, _scrollbar._visible);
 
-                _innerVerticalBlock = new EditorDrawHelper.VerticalBlock(out _newWholeListRect);
+                _innerVerticalBlock = EditorGUILayoutHelper.VerticalBlock(out _newWholeListRect);
             }
 
             public void Dispose()

Editor/TypeDropdown/SelectionTree.cs

@@ -97,9 +97,9 @@ public void Draw()
 
         private static void DrawInfoMessage()
         {
-            using (new DrawHelper.VerticalBlock(DropdownStyle.NoPadding))
+            using (new GUILayoutHelper.Vertical(DropdownStyle.NoPadding))
             {
-                EditorDrawHelper.DrawInfoMessage("No types to select.");
+                EditorGUILayoutHelper.DrawInfoMessage("No types to select.");
             }
         }
 
@@ -187,7 +187,7 @@ private static Rect GetInnerToolbarArea()
             Rect outerToolbarArea = GUILayoutUtility.GetRect(
                 0f,
                 DropdownStyle.SearchToolbarHeight,
-                DrawHelper.ExpandWidth(true));
+                GUILayoutHelper.ExpandWidth(true));
 
             Rect innerToolbarArea = outerToolbarArea
                 .AddHorizontalPadding(10f, 2f)
@@ -208,10 +208,10 @@ private string DrawSearchField(Rect innerToolbarArea, string searchText)
         {
             (Rect searchFieldArea, Rect buttonRect) = innerToolbarArea.CutVertically(DropdownStyle.IconSize, true);
 
-            searchText = EditorDrawHelper.FocusedTextField(searchFieldArea, searchText, "Search",
+            searchText = EditorGUIHelper.FocusedTextField(searchFieldArea, searchText, "Search",
                 DropdownStyle.SearchToolbarStyle, _searchFieldControlName);
 
-            if (DrawHelper.CloseButton(buttonRect))
+            if (GUIHelper.CloseButton(buttonRect))
             {
                 searchText = string.Empty;
                 GUI.FocusControl(null); // Without this, the old text does not disappear for some reason.