Merge pull request #63 from JasonMa0012/2.x

Fix Ramp Editor: Selecting another Key while editing Time causes the …
JasonMa0012 · Sep 14, 2024 · b0ea2cd · b0ea2cd
2 parents c883023 + b3720b2
commit b0ea2cd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/UnityEditorExtension/LwguiGradientEditor/LwguiGradientEditor.cs b/UnityEditorExtension/LwguiGradientEditor/LwguiGradientEditor.cs
@@ -157,7 +157,6 @@ private GradientEditor.Swatch _selectedGradientKey
         private int _lastGradientAlphaSwatchesCount;
 
         private float _lastEditingTime = float.NegativeInfinity;
-        private bool _lastIsEditingText;
 
         private static bool _isAddGradientKeyFailure;
 
@@ -351,7 +350,7 @@ private void OnGradientEditFieldGUI()
                     if (_lastEditingTime != selectionInfo.selectedTime
                         && _lastEditingTime != float.NegativeInfinity
                         // End editing text
-                        && (!EditorGUI.IsEditingTextField() && _lastIsEditingText 
+                        && (EditorGUI.IsEditingTextField() && Event.current.keyCode == KeyCode.Return 
                             // Mouse drag
                             || !EditorGUI.IsEditingTextField() && hasChange))
                     {
@@ -360,8 +359,6 @@ private void OnGradientEditFieldGUI()
                         InitGradientEditor(true);
                         SyncSelectionFromCurveToGradient(true);
                     }
-
-                    _lastIsEditingText = EditorGUI.IsEditingTextField();
                 }
 
                 // Vector Value
@@ -827,7 +824,6 @@ public void Clear()
             _curveEditor?.OnDisable();
             _curveEditor = null;
             _lastChanged = false;
-            _lastIsEditingText = false;
             _lastEditingTime = float.NegativeInfinity;
         }
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.jasonma.lwgui",
-  "version": "1.18.8",
+  "version": "1.18.9",
   "displayName": "LWGUI",
   "description": "A Lightweight, Flexible, Powerful Shader GUI System for Unity.",
   "keywords": [