feat: Added EditorGUIHelper.HasKeyboardFocus(int controlID) method

SolidAlloy · Apr 30, 2021 · 9428a87 · 9428a87
1 parent 414909d
commit 9428a87
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 6 deletions.
diff --git a/Editor/Helpers/EditorGUIHelper.cs b/Editor/Helpers/EditorGUIHelper.cs
@@ -0,0 +1,11 @@
+namespace SolidUtilities.Editor.Helpers
+{
+    using JetBrains.Annotations;
+
+    public static class EditorGUIHelper
+    {
+        [PublicAPI]
+        public static bool HasKeyboardFocus(int controlID)
+            => UnityEditorInternals.EditorGUIHelper.HasKeyboardFocus(controlID);
+    }
+}
diff --git a/Editor/Helpers/EditorGUIHelper.cs.meta b/Editor/Helpers/EditorGUIHelper.cs.meta
diff --git a/UnityEditorInternals.dll b/UnityEditorInternals.dll
diff --git a/UnityEditorInternals2019.dll b/UnityEditorInternals2019.dll
diff --git a/UnityInternals~/UnityEditorInternals/EditorGUIHelper.cs b/UnityInternals~/UnityEditorInternals/EditorGUIHelper.cs
@@ -1,5 +1,4 @@
-#if UNITY_2020
-namespace SolidUtilities.UnityEditorInternals
+namespace SolidUtilities.UnityEditorInternals
 {
     using System;
     using UnityEditor;
@@ -8,6 +7,9 @@ namespace SolidUtilities.UnityEditorInternals
 
     public static class EditorGUIHelper
     {
+        public static bool HasKeyboardFocus(int controlID) => EditorGUI.HasKeyboardFocus(controlID);
+
+#if UNITY_2020
         // I've seen a lot of ugly methods in Unity source code, but this is just.. OMG
         // The method is identical to the original, only non-delayed fields are replaced with their delayed versions where possible.
         // For SerializedPropertyType.Integer, there is also a ternary expression instead of a single LongField because a version of DelayedLongField doesn't exist.
@@ -301,6 +303,6 @@ public static bool DefaultPropertyFieldDelayed(Rect position, SerializedProperty
 
             return childrenAreExpanded;
         }
+#endif
     }
-}
-#endif
+}
diff --git a/UnityInternals~/UnityEditorInternals/EditorGUILayoutHelper.cs b/UnityInternals~/UnityEditorInternals/EditorGUILayoutHelper.cs
@@ -59,7 +59,8 @@ private static void OnGUISafeExtended(this PropertyDrawer propertyDrawer, Rect p
             ScriptAttributeUtility.s_DrawerStack.Pop();
         }
 
-        // Only EditorGUI.DefaultPropertyField is replaced with EditorGUIHelper.DefaultPropertyFieldDelayed
+        // EditorGUI.DefaultPropertyField is replaced with EditorGUIHelper.DefaultPropertyFieldDelayed
+        // propertyDrawer.OnGUISafe is replaced with propertyDrawer.OnGUISafeExtended
         private static bool OnGUIDelayed(this PropertyHandler handler, Rect position, SerializedProperty property,
             GUIContent label, bool includeChildren)
         {

diff --git a/UnityInternals~/UnityEditorInternals/UnityEditorInternals.csproj b/UnityInternals~/UnityEditorInternals/UnityEditorInternals.csproj
@@ -69,13 +69,14 @@
     </ItemGroup>
     <ItemGroup Condition=" '$(Platform)' == 'Unity2019'">
         <Reference Include="UnityEditor">
-            <HintPath>C:\Program Files\Unity Editors\2019.4.12f1\Editor\Data\Managed\UnityEngine\UnityEditor.dll</HintPath>
+            <HintPath>C:\Program Files\Unity Editors\2019.4.24f1\Editor\Data\Managed\UnityEngine\UnityEditor.dll</HintPath>
         </Reference>
     </ItemGroup>
     <ItemGroup>
         <Compile Include="DrawerReplacer.cs" />
         <Compile Include="EditorGUIHelper.cs" />
         <Compile Include="EditorGUILayoutHelper.cs" />
+        <Compile Include="EditorGUISlider.cs" />
         <Compile Include="EditorGUIUtilityProxy.cs" />
         <Compile Include="IDelayable.cs" />
         <Compile Include="LogEntries.cs" />