Use cached GUILayout.ExpandWidth wherever possible (#77)

ManlyMarco · web-flow · commit 532526d9f087 · 2024-06-04T22:38:30.000+02:00
diff --git a/RuntimeUnityEditor.Bepin5/LogViewer/LogViewerEntry.cs b/RuntimeUnityEditor.Bepin5/LogViewer/LogViewerEntry.cs
@@ -52,13 +52,13 @@ public bool DrawEntry()
         {
             GUI.color = GetColor();
             var clicked = GUILayout.Button(_timeString, GUI.skin.label, GUILayout.MinWidth(35));
-            GUILayout.Label("[", GUILayout.ExpandWidth(false));
+            GUILayout.Label("[", IMGUIUtils.LayoutOptionsExpandWidthFalse);
             clicked |= GUILayout.Button(_logLevelString, GUI.skin.label, GUILayout.MinWidth(45));
-            GUILayout.Label(":", GUILayout.ExpandWidth(false));
+            GUILayout.Label(":", IMGUIUtils.LayoutOptionsExpandWidthFalse);
             clicked |= GUILayout.Button(_sourceNameString, GUI.skin.label, GUILayout.MinWidth(100));
-            GUILayout.Label("]", GUILayout.ExpandWidth(false));
+            GUILayout.Label("]", IMGUIUtils.LayoutOptionsExpandWidthFalse);
             GUI.color = Color.white;
-            clicked |= GUILayout.Button(_dataString, GUI.skin.label, GUILayout.ExpandWidth(true));
+            clicked |= GUILayout.Button(_dataString, GUI.skin.label, IMGUIUtils.LayoutOptionsExpandWidthTrue);
             return clicked;
         }
 
diff --git a/RuntimeUnityEditor.Bepin5/LogViewer/LogViewerWindow.cs b/RuntimeUnityEditor.Bepin5/LogViewer/LogViewerWindow.cs
@@ -143,19 +143,19 @@ protected override void DrawContents()
         {
             GUILayout.BeginHorizontal();
             {
-                GUILayout.BeginHorizontal(GUI.skin.box, GUILayout.ExpandWidth(true));
+                GUILayout.BeginHorizontal(GUI.skin.box, IMGUIUtils.LayoutOptionsExpandWidthTrue);
                 {
                     GUI.changed = false;
                     var searchString = SearchString;
                     var isEmpty = string.IsNullOrEmpty(searchString) && GUI.GetNameOfFocusedControl() != "sbox";
                     if (isEmpty) GUI.color = Color.gray;
                     GUI.SetNextControlName("sbox");
-                    var newString = GUILayout.TextField(isEmpty ? "Search log text and stack traces..." : searchString, GUILayout.ExpandWidth(true));
+                    var newString = GUILayout.TextField(isEmpty ? "Search log text and stack traces..." : searchString, IMGUIUtils.LayoutOptionsExpandWidthTrue);
                     if (GUI.changed) SearchString = newString;
                     GUI.color = Color.white;
                 }
                 GUILayout.EndHorizontal();
-                GUILayout.BeginHorizontal(GUI.skin.box, GUILayout.ExpandWidth(false));
+                GUILayout.BeginHorizontal(GUI.skin.box, IMGUIUtils.LayoutOptionsExpandWidthFalse);
                 {
                     if (!Capture) GUI.color = Color.red;
                     Capture = GUILayout.Toggle(Capture, new GUIContent("Enable log capture", "Note: This can hurt performance, especially if there is log spam."));
@@ -240,7 +240,7 @@ protected override void DrawContents()
                             }
                         }
 
-                        if (entry.Sender != null && GUILayout.Button("Inspect", GUILayout.ExpandWidth(false)))
+                        if (entry.Sender != null && GUILayout.Button("Inspect", IMGUIUtils.LayoutOptionsExpandWidthFalse))
                             Inspector.Instance.Push(new InstanceStackEntry(entry, entry.LogEventArgs.Source.SourceName + " -> Log entry"), true);
 
                         DnSpyHelper.DrawDnSpyButtonIfAvailable(entry.Method, new GUIContent("^", $"In dnSpy, attempt to navigate to the method that produced this log message:\n\n{entry.Method.GetFancyDescription()}"));
diff --git a/RuntimeUnityEditor.UMM/RuntimeUnityEditorSettings.cs b/RuntimeUnityEditor.UMM/RuntimeUnityEditorSettings.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.Xml;
 using System.Xml.Serialization;
+using RuntimeUnityEditor.Core.Utils;
 using UnityEngine;
 using UnityModManagerNet;
 #pragma warning disable CS0618
@@ -120,7 +121,7 @@ public void Draw(UnityModManager.ModEntry entry)
                     }
                     else if (setting is Setting<UnityEngine.KeyCode> keycodeSetting)
                     {
-                        GUILayout.Label(settingName, GUILayout.ExpandWidth(false));
+                        GUILayout.Label(settingName, IMGUIUtils.LayoutOptionsExpandWidthFalse);
 
                         var value = new KeyBinding() { keyCode = keycodeSetting.Value };
                         if (UnityModManager.UI.DrawKeybinding(ref value, settingName)) keycodeSetting.Value = value.keyCode;
@@ -129,9 +130,9 @@ public void Draw(UnityModManager.ModEntry entry)
                     else if (setting is Setting<string> stringSetting)
                     {
                         GUILayout.BeginVertical();
-                        GUILayout.Label(settingName, GUILayout.ExpandWidth(false));
+                        GUILayout.Label(settingName, IMGUIUtils.LayoutOptionsExpandWidthFalse);
 
-                        var value = GUILayout.TextField(stringSetting.Value, GUILayout.ExpandWidth(true));
+                        var value = GUILayout.TextField(stringSetting.Value, IMGUIUtils.LayoutOptionsExpandWidthTrue);
                         if (value != stringSetting.Value) stringSetting.Value = value;
                         GUILayout.EndVertical();
                     }
diff --git a/RuntimeUnityEditor/Features/ContextMenu.cs b/RuntimeUnityEditor/Features/ContextMenu.cs
@@ -213,7 +213,7 @@ public void Show(object obj, MemberInfo objMemberInfo, Vector2 clickPoint)
         /// </summary>
         public void DrawContextButton(object obj, MemberInfo objMemberInfo)
         {
-            if (obj != null && GUILayout.Button("...", GUILayout.ExpandWidth(false)))
+            if (obj != null && GUILayout.Button("...", IMGUIUtils.LayoutOptionsExpandWidthFalse))
                 Show(obj, objMemberInfo);
         }
 
diff --git a/RuntimeUnityEditor/Utils/Abstractions/DnSpyHelper.cs b/RuntimeUnityEditor/Utils/Abstractions/DnSpyHelper.cs
@@ -181,7 +181,7 @@ void IFeature.OnEditorShownChanged(bool visible) { }
         private static readonly GUIContent _guiContent = new GUIContent("^", "Navigate to this member in dnSpy");
         internal static void DrawDnSpyButtonIfAvailable(MemberInfo mi, GUIContent customButtonContent = null)
         {
-            if (IsAvailable && GUILayout.Button(customButtonContent ?? _guiContent, GUILayout.ExpandWidth(false)))
+            if (IsAvailable && GUILayout.Button(customButtonContent ?? _guiContent, IMGUIUtils.LayoutOptionsExpandWidthFalse))
                 OpenInDnSpy(mi);
         }
     }
diff --git a/RuntimeUnityEditor/Windows/ChangeHistory/ChangeHistoryWindow.cs b/RuntimeUnityEditor/Windows/ChangeHistory/ChangeHistoryWindow.cs
@@ -87,9 +87,9 @@ protected override void DrawContents()
                             GUI.color = Color.white;
                         }
 
-                        GUILayout.TextField(change.GetDisplayString(), GUI.skin.label, GUILayout.ExpandWidth(true));
+                        GUILayout.TextField(change.GetDisplayString(), GUI.skin.label, IMGUIUtils.LayoutOptionsExpandWidthTrue);
 
-                        if (change.CanUndo && GUILayout.Button(_undoContent, GUILayout.ExpandWidth(false)))
+                        if (change.CanUndo && GUILayout.Button(_undoContent, IMGUIUtils.LayoutOptionsExpandWidthFalse))
                         {
                             try
                             {
@@ -101,7 +101,7 @@ protected override void DrawContents()
                             }
                         }
 
-                        if (!change.Target.IsNullOrDestroyed() && GUILayout.Button(_inspectContent, GUILayout.ExpandWidth(false)))
+                        if (!change.Target.IsNullOrDestroyed() && GUILayout.Button(_inspectContent, IMGUIUtils.LayoutOptionsExpandWidthFalse))
                             Inspector.Inspector.Instance.Push(new InstanceStackEntry(change.Target, change.GetDisplayString()), true);
                     }
                     GUILayout.EndHorizontal();
diff --git a/RuntimeUnityEditor/Windows/Clipboard/ClipboardWindow.cs b/RuntimeUnityEditor/Windows/Clipboard/ClipboardWindow.cs
@@ -40,7 +40,7 @@ protected override void DrawContents()
                     GUILayout.FlexibleSpace();
                     GUILayout.Label("You can copy objects to clipboard by clicking the 'C' button in inspector, or by running the 'copy(object)' command in REPL. Structs are copied by value, classes by reference.\n\n" +
                                     "Clipboard contents can be used in REPL by running the 'paste(index)' command, or in inspector when invoking a method.\n\n" +
-                                    "Press 'X' to remove item from clipboard, right click on it to open a menu with more options.", GUILayout.ExpandWidth(true));
+                                    "Press 'X' to remove item from clipboard, right click on it to open a menu with more options.", IMGUIUtils.LayoutOptionsExpandWidthTrue);
                     GUILayout.FlexibleSpace();
                 }
                 GUILayout.EndVertical();
@@ -57,7 +57,7 @@ protected override void DrawContents()
                     {
                         GUILayout.Label("Index", GUILayout.Width(widthIndex), GUILayout.ExpandWidth(false));
                         GUILayout.Label("Type", GUILayout.Width(widthName), GUILayout.ExpandWidth(false));
-                        GUILayout.Label("Value", GUILayout.ExpandWidth(true));
+                        GUILayout.Label("Value", IMGUIUtils.LayoutOptionsExpandWidthTrue);
                     }
                     GUILayout.EndHorizontal();
 
@@ -78,7 +78,7 @@ protected override void DrawContents()
                             var prevEnabled = GUI.enabled;
                             GUI.enabled = type != null && typeof(IConvertible).IsAssignableFrom(type);
                             GUI.changed = false;
-                            var newVal = GUILayout.TextField(ToStringConverter.ObjectToString(content), GUILayout.ExpandWidth(true));
+                            var newVal = GUILayout.TextField(ToStringConverter.ObjectToString(content), IMGUIUtils.LayoutOptionsExpandWidthTrue);
                             if (GUI.changed && type != null)
                             {
                                 try
@@ -93,7 +93,7 @@ protected override void DrawContents()
 
                             GUI.enabled = prevEnabled;
 
-                            if (GUILayout.Button("X", GUILayout.ExpandWidth(false)))
+                            if (GUILayout.Button("X", IMGUIUtils.LayoutOptionsExpandWidthFalse))
                                 Contents.RemoveAt(index);
                         }
                         GUILayout.EndHorizontal();
diff --git a/RuntimeUnityEditor/Windows/Inspector/Inspector.cs b/RuntimeUnityEditor/Windows/Inspector/Inspector.cs
@@ -185,12 +185,12 @@ protected override void DrawContents()
             {
                 GUILayout.BeginHorizontal();
                 {
-                    GUILayout.BeginHorizontal(GUI.skin.box, GUILayout.ExpandWidth(true));
+                    GUILayout.BeginHorizontal(GUI.skin.box, IMGUIUtils.LayoutOptionsExpandWidthTrue);
                     {
-                        GUILayout.Label("Filter:", GUILayout.ExpandWidth(false));
+                        GUILayout.Label("Filter:", IMGUIUtils.LayoutOptionsExpandWidthFalse);
 
                         GUI.SetNextControlName(SearchBoxName);
-                        SearchString = GUILayout.TextField(SearchString, GUILayout.ExpandWidth(true));
+                        SearchString = GUILayout.TextField(SearchString, IMGUIUtils.LayoutOptionsExpandWidthTrue);
 
                         if (_focusSearchBox)
                         {
@@ -206,7 +206,7 @@ protected override void DrawContents()
                         _showDeclaredOnly = GUILayout.Toggle(_showDeclaredOnly, "Only declared");
 
                         /* todo
-                        GUILayout.Label("Find:", GUILayout.ExpandWidth(false));
+                        GUILayout.Label("Find:", IMGUIUtils.LayoutOptionsExpandWidthFalse);
                         foreach (var obj in new[]
                         {
                                 new KeyValuePair<object, string>(EditorUtilities.GetInstanceClassScanner().OrderBy(x => x.Name()), "Instances"),
@@ -217,7 +217,7 @@ protected override void DrawContents()
                             })
                         {
                             if (obj.Key == null) continue;
-                            if (GUILayout.Button(obj.Value, GUILayout.ExpandWidth(false)))
+                            if (GUILayout.Button(obj.Value, IMGUIUtils.LayoutOptionsExpandWidthFalse))
                                 Push(new InstanceStackEntry(obj.Key, obj.Value), true);
                         }*/
                     }
@@ -257,7 +257,7 @@ protected override void DrawContents()
                             if (currentTab == tab)
                                 GUI.backgroundColor = Color.cyan;
 
-                            if (GUILayout.Button($"Tab {index + 1}: {LimitStringLengthForPreview(tab?.CurrentStackItem?.Name, 18)}", GUILayout.ExpandWidth(false)))
+                            if (GUILayout.Button($"Tab {index + 1}: {LimitStringLengthForPreview(tab?.CurrentStackItem?.Name, 18)}", IMGUIUtils.LayoutOptionsExpandWidthFalse))
                             {
                                 // todo custom context menu for the tab bar? IMGUIUtils.IsMouseRightClick()
                                 if (IMGUIUtils.IsMouseWheelClick())
@@ -293,7 +293,7 @@ protected override void DrawContents()
                             if (stackEntry == currentTab.CurrentStackItem)
                                 GUI.backgroundColor = Color.cyan;
 
-                            if (GUILayout.Button(LimitStringLengthForPreview(stackEntry.Name, 90), GUILayout.ExpandWidth(false)))
+                            if (GUILayout.Button(LimitStringLengthForPreview(stackEntry.Name, 90), IMGUIUtils.LayoutOptionsExpandWidthFalse))
                             {
                                 if (IMGUIUtils.IsMouseRightClick())
                                     stackEntry.ShowContextMenu();
@@ -305,7 +305,7 @@ protected override void DrawContents()
                             }
 
                             if (i + 1 < stackEntries.Length)
-                                GUILayout.Label(">", GUILayout.ExpandWidth(false));
+                                GUILayout.Label(">", IMGUIUtils.LayoutOptionsExpandWidthFalse);
 
                             GUI.backgroundColor = defaultGuiColor;
                         }
@@ -322,7 +322,7 @@ protected override void DrawContents()
                             GUILayout.Space(2);
                             GUILayout.Label("Member name", GUI.skin.box, _inspectorNameWidth);
                             GUILayout.Space(1);
-                            GUILayout.Label("Value", GUI.skin.box, GUILayout.ExpandWidth(true));
+                            GUILayout.Label("Value", GUI.skin.box, IMGUIUtils.LayoutOptionsExpandWidthTrue);
                         }
                         GUILayout.EndHorizontal();
 
@@ -451,7 +451,7 @@ private void DrawSingleContentEntry(ICacheEntry entry)
                 catch (Exception ex)
                 {
                     RuntimeUnityEditorCore.Logger.Log(LogLevel.Error, $"[{Title}] Failed to draw setting {entry?.Name()} - {ex.Message}");
-                    GUILayout.TextArea(ex.Message, GUI.skin.label, GUILayout.ExpandWidth(true));
+                    GUILayout.TextArea(ex.Message, GUI.skin.label, IMGUIUtils.LayoutOptionsExpandWidthTrue);
                 }
             }
             GUILayout.EndHorizontal();
diff --git a/RuntimeUnityEditor/Windows/Inspector/VariableFieldDrawer.cs b/RuntimeUnityEditor/Windows/Inspector/VariableFieldDrawer.cs
diff --git a/RuntimeUnityEditor/Windows/Profiler/ProfilerWindow.cs b/RuntimeUnityEditor/Windows/Profiler/ProfilerWindow.cs
diff --git a/RuntimeUnityEditor/Windows/REPL/REPLWindow.cs b/RuntimeUnityEditor/Windows/REPL/REPLWindow.cs
diff --git a/RuntimeUnityEditor/Windows/Taskbar.cs b/RuntimeUnityEditor/Windows/Taskbar.cs

Original file line number	Diff line number	Diff line change
`@@ -143,19 +143,19 @@ protected override void DrawContents()`
`143`	`143`	`{`
`144`	`144`	`GUILayout.BeginHorizontal();`
`145`	`145`	`{`
`146`		`- GUILayout.BeginHorizontal(GUI.skin.box, GUILayout.ExpandWidth(true));`
	`146`	`+ GUILayout.BeginHorizontal(GUI.skin.box, IMGUIUtils.LayoutOptionsExpandWidthTrue);`
`147`	`147`	`{`
`148`	`148`	`GUI.changed = false;`
`149`	`149`	`var searchString = SearchString;`
`150`	`150`	`var isEmpty = string.IsNullOrEmpty(searchString) && GUI.GetNameOfFocusedControl() != "sbox";`
`151`	`151`	`if (isEmpty) GUI.color = Color.gray;`
`152`	`152`	`GUI.SetNextControlName("sbox");`
`153`		`- var newString = GUILayout.TextField(isEmpty ? "Search log text and stack traces..." : searchString, GUILayout.ExpandWidth(true));`
	`153`	`+ var newString = GUILayout.TextField(isEmpty ? "Search log text and stack traces..." : searchString, IMGUIUtils.LayoutOptionsExpandWidthTrue);`
`154`	`154`	`if (GUI.changed) SearchString = newString;`
`155`	`155`	`GUI.color = Color.white;`
`156`	`156`	`}`
`157`	`157`	`GUILayout.EndHorizontal();`
`158`		`- GUILayout.BeginHorizontal(GUI.skin.box, GUILayout.ExpandWidth(false));`
	`158`	`+ GUILayout.BeginHorizontal(GUI.skin.box, IMGUIUtils.LayoutOptionsExpandWidthFalse);`
`159`	`159`	`{`
`160`	`160`	`if (!Capture) GUI.color = Color.red;`
`161`	`161`	`Capture = GUILayout.Toggle(Capture, new GUIContent("Enable log capture", "Note: This can hurt performance, especially if there is log spam."));`
`@@ -240,7 +240,7 @@ protected override void DrawContents()`
`240`	`240`	`}`
`241`	`241`	`}`
`242`	`242`
`243`		`- if (entry.Sender != null && GUILayout.Button("Inspect", GUILayout.ExpandWidth(false)))`
	`243`	`+ if (entry.Sender != null && GUILayout.Button("Inspect", IMGUIUtils.LayoutOptionsExpandWidthFalse))`
`244`	`244`	`Inspector.Instance.Push(new InstanceStackEntry(entry, entry.LogEventArgs.Source.SourceName + " -> Log entry"), true);`
`245`	`245`
`246`	`246`	`DnSpyHelper.DrawDnSpyButtonIfAvailable(entry.Method, new GUIContent("^", $"In dnSpy, attempt to navigate to the method that produced this log message:\n\n{entry.Method.GetFancyDescription()}"));`
Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ public void Show(object obj, MemberInfo objMemberInfo, Vector2 clickPoint)`
`213`	`213`	`/// </summary>`
`214`	`214`	`public void DrawContextButton(object obj, MemberInfo objMemberInfo)`
`215`	`215`	`{`
`216`		`- if (obj != null && GUILayout.Button("...", GUILayout.ExpandWidth(false)))`
	`216`	`+ if (obj != null && GUILayout.Button("...", IMGUIUtils.LayoutOptionsExpandWidthFalse))`
`217`	`217`	`Show(obj, objMemberInfo);`
`218`	`218`	`}`
`219`	`219`
Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ void IFeature.OnEditorShownChanged(bool visible) { }`
`181`	`181`	`private static readonly GUIContent _guiContent = new GUIContent("^", "Navigate to this member in dnSpy");`
`182`	`182`	`internal static void DrawDnSpyButtonIfAvailable(MemberInfo mi, GUIContent customButtonContent = null)`
`183`	`183`	`{`
`184`		`- if (IsAvailable && GUILayout.Button(customButtonContent ?? _guiContent, GUILayout.ExpandWidth(false)))`
	`184`	`+ if (IsAvailable && GUILayout.Button(customButtonContent ?? _guiContent, IMGUIUtils.LayoutOptionsExpandWidthFalse))`
`185`	`185`	`OpenInDnSpy(mi);`
`186`	`186`	`}`
`187`	`187`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,9 +87,9 @@ protected override void DrawContents()`
`87`	`87`	`GUI.color = Color.white;`
`88`	`88`	`}`
`89`	`89`
`90`		`- GUILayout.TextField(change.GetDisplayString(), GUI.skin.label, GUILayout.ExpandWidth(true));`
	`90`	`+ GUILayout.TextField(change.GetDisplayString(), GUI.skin.label, IMGUIUtils.LayoutOptionsExpandWidthTrue);`
`91`	`91`
`92`		`- if (change.CanUndo && GUILayout.Button(_undoContent, GUILayout.ExpandWidth(false)))`
	`92`	`+ if (change.CanUndo && GUILayout.Button(_undoContent, IMGUIUtils.LayoutOptionsExpandWidthFalse))`
`93`	`93`	`{`
`94`	`94`	`try`
`95`	`95`	`{`
`@@ -101,7 +101,7 @@ protected override void DrawContents()`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`
`104`		`- if (!change.Target.IsNullOrDestroyed() && GUILayout.Button(_inspectContent, GUILayout.ExpandWidth(false)))`
	`104`	`+ if (!change.Target.IsNullOrDestroyed() && GUILayout.Button(_inspectContent, IMGUIUtils.LayoutOptionsExpandWidthFalse))`
`105`	`105`	`Inspector.Inspector.Instance.Push(new InstanceStackEntry(change.Target, change.GetDisplayString()), true);`
`106`	`106`	`}`
`107`	`107`	`GUILayout.EndHorizontal();`
Original file line number	Diff line number	Diff line change
`@@ -185,12 +185,12 @@ protected override void DrawContents()`
`185`	`185`	`{`
`186`	`186`	`GUILayout.BeginHorizontal();`
`187`	`187`	`{`
`188`		`- GUILayout.BeginHorizontal(GUI.skin.box, GUILayout.ExpandWidth(true));`
	`188`	`+ GUILayout.BeginHorizontal(GUI.skin.box, IMGUIUtils.LayoutOptionsExpandWidthTrue);`
`189`	`189`	`{`
`190`		`- GUILayout.Label("Filter:", GUILayout.ExpandWidth(false));`
	`190`	`+ GUILayout.Label("Filter:", IMGUIUtils.LayoutOptionsExpandWidthFalse);`
`191`	`191`
`192`	`192`	`GUI.SetNextControlName(SearchBoxName);`
`193`		`- SearchString = GUILayout.TextField(SearchString, GUILayout.ExpandWidth(true));`
	`193`	`+ SearchString = GUILayout.TextField(SearchString, IMGUIUtils.LayoutOptionsExpandWidthTrue);`
`194`	`194`
`195`	`195`	`if (_focusSearchBox)`
`196`	`196`	`{`
`@@ -206,7 +206,7 @@ protected override void DrawContents()`
`206`	`206`	`_showDeclaredOnly = GUILayout.Toggle(_showDeclaredOnly, "Only declared");`
`207`	`207`
`208`	`208`	`/* todo`
`209`		`- GUILayout.Label("Find:", GUILayout.ExpandWidth(false));`
	`209`	`+ GUILayout.Label("Find:", IMGUIUtils.LayoutOptionsExpandWidthFalse);`
`210`	`210`	`foreach (var obj in new[]`
`211`	`211`	`{`
`212`	`212`	`new KeyValuePair<object, string>(EditorUtilities.GetInstanceClassScanner().OrderBy(x => x.Name()), "Instances"),`
`@@ -217,7 +217,7 @@ protected override void DrawContents()`
`217`	`217`	`})`
`218`	`218`	`{`
`219`	`219`	`if (obj.Key == null) continue;`
`220`		`- if (GUILayout.Button(obj.Value, GUILayout.ExpandWidth(false)))`
	`220`	`+ if (GUILayout.Button(obj.Value, IMGUIUtils.LayoutOptionsExpandWidthFalse))`
`221`	`221`	`Push(new InstanceStackEntry(obj.Key, obj.Value), true);`
`222`	`222`	`}*/`
`223`	`223`	`}`
`@@ -257,7 +257,7 @@ protected override void DrawContents()`
`257`	`257`	`if (currentTab == tab)`
`258`	`258`	`GUI.backgroundColor = Color.cyan;`
`259`	`259`
`260`		`- if (GUILayout.Button($"Tab {index + 1}: {LimitStringLengthForPreview(tab?.CurrentStackItem?.Name, 18)}", GUILayout.ExpandWidth(false)))`
	`260`	`+ if (GUILayout.Button($"Tab {index + 1}: {LimitStringLengthForPreview(tab?.CurrentStackItem?.Name, 18)}", IMGUIUtils.LayoutOptionsExpandWidthFalse))`
`261`	`261`	`{`
`262`	`262`	`// todo custom context menu for the tab bar? IMGUIUtils.IsMouseRightClick()`
`263`	`263`	`if (IMGUIUtils.IsMouseWheelClick())`
`@@ -293,7 +293,7 @@ protected override void DrawContents()`
`293`	`293`	`if (stackEntry == currentTab.CurrentStackItem)`
`294`	`294`	`GUI.backgroundColor = Color.cyan;`
`295`	`295`
`296`		`- if (GUILayout.Button(LimitStringLengthForPreview(stackEntry.Name, 90), GUILayout.ExpandWidth(false)))`
	`296`	`+ if (GUILayout.Button(LimitStringLengthForPreview(stackEntry.Name, 90), IMGUIUtils.LayoutOptionsExpandWidthFalse))`
`297`	`297`	`{`
`298`	`298`	`if (IMGUIUtils.IsMouseRightClick())`
`299`	`299`	`stackEntry.ShowContextMenu();`
`@@ -305,7 +305,7 @@ protected override void DrawContents()`
`305`	`305`	`}`
`306`	`306`
`307`	`307`	`if (i + 1 < stackEntries.Length)`
`308`		`- GUILayout.Label(">", GUILayout.ExpandWidth(false));`
	`308`	`+ GUILayout.Label(">", IMGUIUtils.LayoutOptionsExpandWidthFalse);`
`309`	`309`
`310`	`310`	`GUI.backgroundColor = defaultGuiColor;`
`311`	`311`	`}`
`@@ -322,7 +322,7 @@ protected override void DrawContents()`
`322`	`322`	`GUILayout.Space(2);`
`323`	`323`	`GUILayout.Label("Member name", GUI.skin.box, _inspectorNameWidth);`
`324`	`324`	`GUILayout.Space(1);`
`325`		`- GUILayout.Label("Value", GUI.skin.box, GUILayout.ExpandWidth(true));`
	`325`	`+ GUILayout.Label("Value", GUI.skin.box, IMGUIUtils.LayoutOptionsExpandWidthTrue);`
`326`	`326`	`}`
`327`	`327`	`GUILayout.EndHorizontal();`
`328`	`328`
`@@ -451,7 +451,7 @@ private void DrawSingleContentEntry(ICacheEntry entry)`
`451`	`451`	`catch (Exception ex)`
`452`	`452`	`{`
`453`	`453`	`RuntimeUnityEditorCore.Logger.Log(LogLevel.Error, $"[{Title}] Failed to draw setting {entry?.Name()} - {ex.Message}");`
`454`		`- GUILayout.TextArea(ex.Message, GUI.skin.label, GUILayout.ExpandWidth(true));`
	`454`	`+ GUILayout.TextArea(ex.Message, GUI.skin.label, IMGUIUtils.LayoutOptionsExpandWidthTrue);`
`455`	`455`	`}`
`456`	`456`	`}`
`457`	`457`	`GUILayout.EndHorizontal();`