Fix InlineEditor preview layout

codewriter-packages · Apr 6, 2024 · 0c5b8f4 · 0c5b8f4
1 parent 19b6729
commit 0c5b8f4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/Editor.Extras/Drawers/InlineEditorDrawer.cs b/Editor.Extras/Drawers/InlineEditorDrawer.cs
@@ -34,7 +34,6 @@ public override TriElement CreateElement(TriProperty property, TriElement next)
             {
                 mode = Attribute.Mode,
                 previewHeight = Attribute.PreviewHeight,
-                previewWidth = Attribute.PreviewWidth,
             }));
             return element;
         }

diff --git a/Editor/Elements/InlineEditorElement.cs b/Editor/Elements/InlineEditorElement.cs
@@ -16,7 +16,6 @@ public class InlineEditorElement : TriElement
         public struct Props
         {
             public InlineEditorModes mode;
-            public float previewWidth;
             public float previewHeight;
 
             public bool DrawGUI => (mode & InlineEditorModes.GUIOnly) != 0;
@@ -95,7 +94,7 @@ public override void OnGUI(Rect position)
             if (_editor != null && shouldDrawEditor)
             {
                 GUILayout.BeginArea(_editorPosition);
-                GUILayout.BeginHorizontal();
+                GUILayout.BeginVertical();
 
                 if (_props.DrawHeader || _props.DrawGUI)
                 {
@@ -122,13 +121,8 @@ public override void OnGUI(Rect position)
                 {
                     GUILayout.BeginVertical();
 
-                    var horizontal = _props.DrawHeader || _props.DrawGUI;
-
-                    var previewOpts = horizontal
-                        ? new[] {GUILayout.Width(_props.previewWidth), GUILayout.ExpandHeight(true),}
-                        : new[] {GUILayout.ExpandWidth(true), GUILayout.Height(_props.previewHeight),};
-
-                    var previewRect = GUILayoutUtility.GetRect(GUIContent.none, GUIStyle.none, previewOpts);
+                    var previewOpts = new[] {GUILayout.ExpandWidth(true), GUILayout.Height(_props.previewHeight),};
+                    var previewRect = EditorGUILayout.GetControlRect(false, _props.previewHeight, previewOpts);
 
                     previewRect.width = Mathf.Max(previewRect.width, 10);
                     previewRect.height = Mathf.Max(previewRect.height, 10);
@@ -143,7 +137,7 @@ public override void OnGUI(Rect position)
                     GUILayout.EndVertical();
                 }
 
-                GUILayout.EndHorizontal();
+                GUILayout.EndVertical();
                 lastEditorRect = GUILayoutUtility.GetLastRect();
                 GUILayout.EndArea();
             }

diff --git a/Runtime/Attributes/InlineEditorAttribute.cs b/Runtime/Attributes/InlineEditorAttribute.cs
@@ -10,7 +10,6 @@ public class InlineEditorAttribute : Attribute
     {
         public InlineEditorModes Mode { get; set; } = InlineEditorModes.GUIOnly;
 
-        public float PreviewWidth { get; set; } = 100;
         public float PreviewHeight { get; set; } = 50;
 
         public InlineEditorAttribute()