Fix Adaptive Enum Field Width

JasonMa0012 · Dec 27, 2023 · 96b79b5 · 96b79b5
1 parent 0109c81
commit 96b79b5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Editor/Helper.cs b/Editor/Helper.cs
@@ -125,9 +125,9 @@ public static LWGUI GetLWGUI(MaterialEditor editor)
 			}
 		}
 
-		public static void AdaptiveFieldWidth(GUIStyle style, GUIContent content, float extraWidth = 0)
+		public static void AdaptiveFieldWidth(GUIStyle style, GUIContent content)
 		{
-			var extraTextWidth = Mathf.Max(0, style.CalcSize(content).x + extraWidth - EditorGUIUtility.fieldWidth);
+			var extraTextWidth = Mathf.Max(0, style.CalcSize(content).x - (EditorGUIUtility.fieldWidth - RevertableHelper.revertButtonWidth));
 			EditorGUIUtility.labelWidth -= extraTextWidth;
 			EditorGUIUtility.fieldWidth += extraTextWidth;
 		}

diff --git a/Editor/ShaderDrawer.cs b/Editor/ShaderDrawer.cs
@@ -535,7 +535,7 @@ public override void DrawProp(Rect position, MaterialProperty prop, GUIContent l
 				return;
 			}
 
-			Helper.AdaptiveFieldWidth(EditorStyles.popup, _names[index], EditorStyles.popup.lineHeight);
+			Helper.AdaptiveFieldWidth(EditorStyles.popup, _names[index]);
 			int newIndex = EditorGUI.Popup(rect, label, index, _names);
 			EditorGUI.showMixedValue = false;
 			if (Helper.EndChangeCheck(lwgui, prop))
@@ -1109,7 +1109,7 @@ public override void DrawProp(Rect position, MaterialProperty prop, GUIContent l
 			}
 
 			var presetNames = preset.presets.Select(((inPreset) => new GUIContent(inPreset.presetName))).ToArray();
-			Helper.AdaptiveFieldWidth(EditorStyles.popup, presetNames[index], EditorStyles.popup.lineHeight);
+			Helper.AdaptiveFieldWidth(EditorStyles.popup, presetNames[index]);
 			int newIndex = EditorGUI.Popup(rect, label, index, presetNames);
 			if (Helper.EndChangeCheck(lwgui, prop))
 			{

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