fix HelpBox height

JasonMa0012 · Dec 10, 2023 · d0fbd0f · d0fbd0f
1 parent d363ae7
commit d0fbd0f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/Editor/Helper.cs b/Editor/Helper.cs
@@ -357,7 +357,10 @@ public static void DrawHelpbox(PropertyStaticData propertyStaticData, PropertyDy
 			if (!string.IsNullOrEmpty(helpboxStr))
 			{
 				var content = new GUIContent(helpboxStr, _helpboxIcon);
-				var helpboxRect = EditorGUI.IndentedRect(EditorGUILayout.GetControlRect(true, guiStyle_Helpbox.CalcHeight(content, EditorGUIUtility.currentViewWidth)));
+				var textWidth = EditorGUIUtility.currentViewWidth - ReflectionHelper.EditorGUI_Indent - RevertableHelper.revertButtonWidth
+							  - _helpboxIcon.width - guiStyle_Helpbox.margin.horizontal + 0.5f;
+				var textHeight = guiStyle_Helpbox.CalcHeight(new GUIContent(helpboxStr), textWidth);
+				var helpboxRect = EditorGUI.IndentedRect(EditorGUILayout.GetControlRect(true, textHeight));
 				helpboxRect.xMax -= RevertableHelper.revertButtonWidth;
 				GUI.Label(helpboxRect, content, guiStyle_Helpbox);
 				// EditorGUI.HelpBox(helpboxRect, helpboxStr, MessageType.Info);

diff --git a/Editor/ReflectionHelper.cs b/Editor/ReflectionHelper.cs
@@ -87,7 +87,16 @@ public static void DefaultShaderPropertyInternal(MaterialEditor editor, Rect pos
 			EditorUtility_DisplayCustomMenuWithSeparators_Method.Invoke(null, new System.Object[] { position, options, enabled, separator, selected, callback, userData, showHotkey });
 		}
 		#endregion
-
+
+
+		#region EditorGUI
+
+		private static Type         EditorGUI_Type            = typeof(EditorGUI);
+		private static PropertyInfo EditorGUI_Indent_Property = EditorGUI_Type.GetProperty("indent", BindingFlags.NonPublic | BindingFlags.Static);
+
+		public static float EditorGUI_Indent { get { return (float)EditorGUI_Indent_Property.GetValue(null); } }
+
+		#endregion
 
 		#region MaterialEnumDrawer
 		// UnityEditor.MaterialEnumDrawer(string enumName)