Unity 6000.2.0a9 C# reference source code

Author: Unity Technologies

Editor/Mono/Animation/AnimationWindow/AnimationWindowHierarchy.cs

@@ -44,6 +44,7 @@ internal class AnimationWindowHierarchy
         // Animation window shared state
         private AnimationWindowState m_State;
         private TreeViewController m_TreeView;
+        private AnimationWindowHierarchyGUI m_HierarchyGUI;
 
         public Vector2 GetContentSize()
         {
@@ -65,6 +66,7 @@ public void OnGUI(Rect position)
         {
             m_TreeView.OnEvent();
             m_TreeView.OnGUI(position, GUIUtility.GetControlID(FocusType.Keyboard));
+            m_HierarchyGUI.ReclaimPendingFieldFocus();
         }
 
         public void Init(EditorWindow owner, Rect rect)
@@ -74,9 +76,10 @@ public void Init(EditorWindow owner, Rect rect)
 
             m_TreeView = new TreeViewController(owner, m_State.hierarchyState);
             m_State.hierarchyData = new AnimationWindowHierarchyDataSource(m_TreeView, m_State);
+            m_HierarchyGUI = new AnimationWindowHierarchyGUI(m_TreeView, m_State);
             m_TreeView.Init(rect,
                 m_State.hierarchyData,
-                new AnimationWindowHierarchyGUI(m_TreeView, m_State),
+                m_HierarchyGUI,
                 null
             );
 

Editor/Mono/Animation/AnimationWindow/AnimationWindowHierarchyGUI.cs

@@ -30,6 +30,9 @@ internal class AnimationWindowHierarchyGUI : TreeViewGUI
         private int[] m_HierarchyItemValueControlIDs;
         private int[] m_HierarchyItemButtonControlIDs;
 
+        private bool m_NeedsToReclaimFieldFocus;
+        private int m_FieldToReclaimFocus;
+
         private const float k_RowRightOffset = 10;
         private const float k_ValueFieldDragWidth = 15;
         private const float k_ValueFieldWidth = 80;
@@ -352,11 +355,12 @@ private void DoValueField(Rect rect, AnimationWindowHierarchyNode node, int row)
                             && Event.current.type == EventType.KeyDown
                             && (Event.current.character == '\n' || (int)Event.current.character == 3));
 
-                        //  Force back keyboard focus to float field editor when editing it.
-                        //  TreeView forces keyboard focus on itself at mouse down and we lose focus here.
+                        // Force back keyboard focus to float field editor when editing it since the TreeView forces keyboard focus on itself at mouse down.
+                        // The focus will be reclaimed after the TreeViewController.OnGUI call.
                         if (EditorGUI.s_RecycledEditor.controlID == id && Event.current.type == EventType.MouseDown && valueFieldRect.Contains(Event.current.mousePosition))
                         {
-                            GUIUtility.keyboardControl = id;
+                            m_NeedsToReclaimFieldFocus = true;
+                            m_FieldToReclaimFocus = id;
                         }
 
                         if (curve.isDiscreteCurve)
@@ -421,6 +425,15 @@ private void DoValueField(Rect rect, AnimationWindowHierarchyNode node, int row)
             }
         }
 
+        internal void ReclaimPendingFieldFocus()
+        {
+            if (m_NeedsToReclaimFieldFocus)
+            {
+                GUIUtility.keyboardControl = m_FieldToReclaimFocus;
+                m_NeedsToReclaimFieldFocus = false;
+            }
+        }
+
         private bool DoTreeViewButton(int id, Rect position, GUIContent content, GUIStyle style)
         {
             Event evt = Event.current;