Skip to content
This repository was archived by the owner on May 9, 2023. It is now read-only.

Commit 653b4a2

Browse files
sinai-devsinai-dev
committed
Fix BeginVertical and BeginHorizontal
1 parent 065ab03 commit 653b4a2

18 files changed

+305
-179
lines changed

‎src/CachedObjects/CacheObjectBase.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ public void Draw(Rect window, float labelWidth = 215f)
390390

391391
if (HasParameters)
392392
{
393-
GUILayout.BeginVertical(null);
393+
GUIUnstrip.BeginVertical();
394394

395395
if (m_isEvaluating)
396396
{
@@ -406,16 +406,16 @@ public void Draw(Rect window, float labelWidth = 215f)
406406
label = $"<i>[{label} = {m_arguments[i].DefaultValue}]</i>";
407407
}
408408

409-
GUILayout.BeginHorizontal(null);
409+
GUIUnstrip.BeginHorizontal();
410410

411411
GUILayout.Label(i.ToString(), new GUILayoutOption[] { GUILayout.Width(20) });
412412
m_argumentInput[i] = GUILayout.TextField(input, new GUILayoutOption[] { GUILayout.Width(150) });
413413
GUILayout.Label(label, null);
414414

415-
GUILayout.EndHorizontal();
415+
GUIUnstrip.EndHorizontal();
416416
}
417417

418-
GUILayout.BeginHorizontal(null);
418+
GUIUnstrip.BeginHorizontal();
419419
if (GUILayout.Button(EVALUATE_LABEL, new GUILayoutOption[] { GUILayout.Width(70) }))
420420
{
421421
if (cm != null)
@@ -431,7 +431,7 @@ public void Draw(Rect window, float labelWidth = 215f)
431431
{
432432
m_isEvaluating = false;
433433
}
434-
GUILayout.EndHorizontal();
434+
GUIUnstrip.EndHorizontal();
435435
}
436436
else
437437
{
@@ -441,25 +441,25 @@ public void Draw(Rect window, float labelWidth = 215f)
441441
}
442442
}
443443

444-
GUILayout.EndVertical();
444+
GUIUnstrip.EndVertical();
445445

446446
// new line and space
447-
GUILayout.EndHorizontal();
448-
GUILayout.BeginHorizontal(null);
447+
GUIUnstrip.EndHorizontal();
448+
GUIUnstrip.BeginHorizontal();
449449
GUIUnstrip.Space(labelWidth);
450450
}
451451
else if (cm != null)
452452
{
453-
//GUILayout.BeginHorizontal(null);
453+
//GUIUnstrip.BeginHorizontal();
454454

455455
if (GUILayout.Button(EVALUATE_LABEL, new GUILayoutOption[] { GUILayout.Width(70) }))
456456
{
457457
cm.Evaluate();
458458
}
459459

460460
// new line and space
461-
GUILayout.EndHorizontal();
462-
GUILayout.BeginHorizontal(null);
461+
GUIUnstrip.EndHorizontal();
462+
GUIUnstrip.BeginHorizontal();
463463
GUIUnstrip.Space(labelWidth);
464464
}
465465

‎src/CachedObjects/Object/CacheDictionary.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,8 @@ public override void DrawValue(Rect window, float width)
243243

244244
if (count > Pages.ItemsPerPage)
245245
{
246-
GUILayout.EndHorizontal();
247-
GUILayout.BeginHorizontal(null);
246+
GUIUnstrip.EndHorizontal();
247+
GUIUnstrip.BeginHorizontal();
248248

249249
GUIUnstrip.Space(whitespace);
250250

@@ -273,8 +273,8 @@ public override void DrawValue(Rect window, float width)
273273
var val = m_cachedValues[i];
274274

275275
//collapsing the BeginHorizontal called from ReflectionWindow.WindowFunction or previous array entry
276-
GUILayout.EndHorizontal();
277-
GUILayout.BeginHorizontal(null);
276+
GUIUnstrip.EndHorizontal();
277+
GUIUnstrip.BeginHorizontal();
278278

279279
//GUIUnstrip.Space(whitespace);
280280

‎src/CachedObjects/Object/CacheList.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,8 @@ public override void DrawValue(Rect window, float width)
305305

306306
if (count > Pages.ItemsPerPage)
307307
{
308-
GUILayout.EndHorizontal();
309-
GUILayout.BeginHorizontal(null);
308+
GUIUnstrip.EndHorizontal();
309+
GUIUnstrip.BeginHorizontal();
310310

311311
GUIUnstrip.Space(whitespace);
312312

@@ -334,8 +334,8 @@ public override void DrawValue(Rect window, float width)
334334
var entry = m_cachedEntries[i];
335335

336336
//collapsing the BeginHorizontal called from ReflectionWindow.WindowFunction or previous array entry
337-
GUILayout.EndHorizontal();
338-
GUILayout.BeginHorizontal(null);
337+
GUIUnstrip.EndHorizontal();
338+
GUIUnstrip.BeginHorizontal();
339339

340340
GUIUnstrip.Space(whitespace);
341341

‎src/CachedObjects/Struct/CacheColor.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,44 +56,44 @@ public override void DrawValue(Rect window, float width)
5656

5757
if (CanWrite && IsExpanded)
5858
{
59-
GUILayout.EndHorizontal();
59+
GUIUnstrip.EndHorizontal();
6060

6161
var whitespace = CalcWhitespace(window);
6262

63-
GUILayout.BeginHorizontal(null);
63+
GUIUnstrip.BeginHorizontal();
6464
GUIUnstrip.Space(whitespace);
6565
GUILayout.Label("R:", new GUILayoutOption[] { GUILayout.Width(30) });
6666
r = GUILayout.TextField(r, new GUILayoutOption[] { GUILayout.Width(120) });
67-
GUILayout.EndHorizontal();
67+
GUIUnstrip.EndHorizontal();
6868

69-
GUILayout.BeginHorizontal(null);
69+
GUIUnstrip.BeginHorizontal();
7070
GUIUnstrip.Space(whitespace);
7171
GUILayout.Label("G:", new GUILayoutOption[] { GUILayout.Width(30) });
7272
g = GUILayout.TextField(g, new GUILayoutOption[] { GUILayout.Width(120) });
73-
GUILayout.EndHorizontal();
73+
GUIUnstrip.EndHorizontal();
7474

75-
GUILayout.BeginHorizontal(null);
75+
GUIUnstrip.BeginHorizontal();
7676
GUIUnstrip.Space(whitespace);
7777
GUILayout.Label("B:", new GUILayoutOption[] { GUILayout.Width(30) });
7878
b = GUILayout.TextField(b, new GUILayoutOption[] { GUILayout.Width(120) });
79-
GUILayout.EndHorizontal();
79+
GUIUnstrip.EndHorizontal();
8080

81-
GUILayout.BeginHorizontal(null);
81+
GUIUnstrip.BeginHorizontal();
8282
GUIUnstrip.Space(whitespace);
8383
GUILayout.Label("A:", new GUILayoutOption[] { GUILayout.Width(30) });
8484
a = GUILayout.TextField(a, new GUILayoutOption[] { GUILayout.Width(120) });
85-
GUILayout.EndHorizontal();
85+
GUIUnstrip.EndHorizontal();
8686

8787
// draw set value button
88-
GUILayout.BeginHorizontal(null);
88+
GUIUnstrip.BeginHorizontal();
8989
GUIUnstrip.Space(whitespace);
9090
if (GUILayout.Button("<color=lime>Apply</color>", new GUILayoutOption[] { GUILayout.Width(155) }))
9191
{
9292
SetValueFromInput();
9393
}
94-
GUILayout.EndHorizontal();
94+
GUIUnstrip.EndHorizontal();
9595

96-
GUILayout.BeginHorizontal(null);
96+
GUIUnstrip.BeginHorizontal();
9797
}
9898
}
9999

‎src/CachedObjects/Struct/CacheQuaternion.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,38 +51,38 @@ public override void DrawValue(Rect window, float width)
5151

5252
if (CanWrite && IsExpanded)
5353
{
54-
GUILayout.EndHorizontal();
54+
GUIUnstrip.EndHorizontal();
5555

5656
var whitespace = CalcWhitespace(window);
5757

58-
GUILayout.BeginHorizontal(null);
58+
GUIUnstrip.BeginHorizontal();
5959
GUIUnstrip.Space(whitespace);
6060
GUILayout.Label("X:", new GUILayoutOption[] { GUILayout.Width(30) });
6161
x = GUILayout.TextField(x, new GUILayoutOption[] { GUILayout.Width(120) });
62-
GUILayout.EndHorizontal();
62+
GUIUnstrip.EndHorizontal();
6363

64-
GUILayout.BeginHorizontal(null);
64+
GUIUnstrip.BeginHorizontal();
6565
GUIUnstrip.Space(whitespace);
6666
GUILayout.Label("Y:", new GUILayoutOption[] { GUILayout.Width(30) });
6767
y = GUILayout.TextField(y, new GUILayoutOption[] { GUILayout.Width(120) });
68-
GUILayout.EndHorizontal();
68+
GUIUnstrip.EndHorizontal();
6969

70-
GUILayout.BeginHorizontal(null);
70+
GUIUnstrip.BeginHorizontal();
7171
GUIUnstrip.Space(whitespace);
7272
GUILayout.Label("Z:", new GUILayoutOption[] { GUILayout.Width(30) });
7373
z = GUILayout.TextField(z, new GUILayoutOption[] { GUILayout.Width(120) });
74-
GUILayout.EndHorizontal();
74+
GUIUnstrip.EndHorizontal();
7575

7676
// draw set value button
77-
GUILayout.BeginHorizontal(null);
77+
GUIUnstrip.BeginHorizontal();
7878
GUIUnstrip.Space(whitespace);
7979
if (GUILayout.Button("<color=lime>Apply</color>", new GUILayoutOption[] { GUILayout.Width(155) }))
8080
{
8181
SetValueFromInput();
8282
}
83-
GUILayout.EndHorizontal();
83+
GUIUnstrip.EndHorizontal();
8484

85-
GUILayout.BeginHorizontal(null);
85+
GUIUnstrip.BeginHorizontal();
8686
}
8787
}
8888

‎src/CachedObjects/Struct/CacheRect.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,44 +53,44 @@ public override void DrawValue(Rect window, float width)
5353

5454
if (CanWrite && IsExpanded)
5555
{
56-
GUILayout.EndHorizontal();
56+
GUIUnstrip.EndHorizontal();
5757

5858
var whitespace = CalcWhitespace(window);
5959

60-
GUILayout.BeginHorizontal(null);
60+
GUIUnstrip.BeginHorizontal();
6161
GUIUnstrip.Space(whitespace);
6262
GUILayout.Label("X:", new GUILayoutOption[] { GUILayout.Width(30) });
6363
x = GUILayout.TextField(x, new GUILayoutOption[] { GUILayout.Width(120) });
64-
GUILayout.EndHorizontal();
64+
GUIUnstrip.EndHorizontal();
6565

66-
GUILayout.BeginHorizontal(null);
66+
GUIUnstrip.BeginHorizontal();
6767
GUIUnstrip.Space(whitespace);
6868
GUILayout.Label("Y:", new GUILayoutOption[] { GUILayout.Width(30) });
6969
y = GUILayout.TextField(y, new GUILayoutOption[] { GUILayout.Width(120) });
70-
GUILayout.EndHorizontal();
70+
GUIUnstrip.EndHorizontal();
7171

72-
GUILayout.BeginHorizontal(null);
72+
GUIUnstrip.BeginHorizontal();
7373
GUIUnstrip.Space(whitespace);
7474
GUILayout.Label("W:", new GUILayoutOption[] { GUILayout.Width(30) });
7575
w = GUILayout.TextField(w, new GUILayoutOption[] { GUILayout.Width(120) });
76-
GUILayout.EndHorizontal();
76+
GUIUnstrip.EndHorizontal();
7777

78-
GUILayout.BeginHorizontal(null);
78+
GUIUnstrip.BeginHorizontal();
7979
GUIUnstrip.Space(whitespace);
8080
GUILayout.Label("H:", new GUILayoutOption[] { GUILayout.Width(30) });
8181
h = GUILayout.TextField(h, new GUILayoutOption[] { GUILayout.Width(120) });
82-
GUILayout.EndHorizontal();
82+
GUIUnstrip.EndHorizontal();
8383

8484
// draw set value button
85-
GUILayout.BeginHorizontal(null);
85+
GUIUnstrip.BeginHorizontal();
8686
GUIUnstrip.Space(whitespace);
8787
if (GUILayout.Button("<color=lime>Apply</color>", new GUILayoutOption[] { GUILayout.Width(155) }))
8888
{
8989
SetValueFromInput();
9090
}
91-
GUILayout.EndHorizontal();
91+
GUIUnstrip.EndHorizontal();
9292

93-
GUILayout.BeginHorizontal(null);
93+
GUIUnstrip.BeginHorizontal();
9494
}
9595
}
9696

‎src/CachedObjects/Struct/CacheVector.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -88,52 +88,52 @@ public override void DrawValue(Rect window, float width)
8888

8989
if (CanWrite && IsExpanded)
9090
{
91-
GUILayout.EndHorizontal();
91+
GUIUnstrip.EndHorizontal();
9292

9393
var whitespace = CalcWhitespace(window);
9494

9595
// always draw x and y
96-
GUILayout.BeginHorizontal(null);
96+
GUIUnstrip.BeginHorizontal();
9797
GUIUnstrip.Space(whitespace);
9898
GUILayout.Label("X:", new GUILayoutOption[] { GUILayout.Width(30) });
9999
x = GUILayout.TextField(x, new GUILayoutOption[] { GUILayout.Width(120) });
100-
GUILayout.EndHorizontal();
100+
GUIUnstrip.EndHorizontal();
101101

102-
GUILayout.BeginHorizontal(null);
102+
GUIUnstrip.BeginHorizontal();
103103
GUIUnstrip.Space(whitespace);
104104
GUILayout.Label("Y:", new GUILayoutOption[] { GUILayout.Width(30) });
105105
y = GUILayout.TextField(y, new GUILayoutOption[] { GUILayout.Width(120) });
106-
GUILayout.EndHorizontal();
106+
GUIUnstrip.EndHorizontal();
107107

108108
if (VectorSize > 2)
109109
{
110110
// draw z
111-
GUILayout.BeginHorizontal(null);
111+
GUIUnstrip.BeginHorizontal();
112112
GUIUnstrip.Space(whitespace);
113113
GUILayout.Label("Z:", new GUILayoutOption[] { GUILayout.Width(30) });
114114
z = GUILayout.TextField(z, new GUILayoutOption[] { GUILayout.Width(120) });
115-
GUILayout.EndHorizontal();
115+
GUIUnstrip.EndHorizontal();
116116
}
117117
if (VectorSize > 3)
118118
{
119119
// draw w
120-
GUILayout.BeginHorizontal(null);
120+
GUIUnstrip.BeginHorizontal();
121121
GUIUnstrip.Space(whitespace);
122122
GUILayout.Label("W:", new GUILayoutOption[] { GUILayout.Width(30) });
123123
w = GUILayout.TextField(w, new GUILayoutOption[] { GUILayout.Width(120) });
124-
GUILayout.EndHorizontal();
124+
GUIUnstrip.EndHorizontal();
125125
}
126126

127127
// draw set value button
128-
GUILayout.BeginHorizontal(null);
128+
GUIUnstrip.BeginHorizontal();
129129
GUIUnstrip.Space(whitespace);
130130
if (GUILayout.Button("<color=lime>Apply</color>", new GUILayoutOption[] { GUILayout.Width(155) }))
131131
{
132132
SetValueFromInput();
133133
}
134-
GUILayout.EndHorizontal();
134+
GUIUnstrip.EndHorizontal();
135135

136-
GUILayout.BeginHorizontal(null);
136+
GUIUnstrip.BeginHorizontal();
137137
}
138138
}
139139

‎src/Helpers/ReflectionHelpers.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ public static object Il2CppCast(object obj, Type castTo)
3636

3737
public static bool IsEnumerable(Type t)
3838
{
39+
// Not needed for Il2Cpp at the moment. Don't want these to behave as Enumerables.
40+
//if (typeof(Transform).IsAssignableFrom(t)) return false;
41+
3942
return typeof(IEnumerable).IsAssignableFrom(t);
4043
}
4144

‎src/Helpers/UIHelpers.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public static void GOButton_Impl(object _obj, Color activeColor, string label, b
6868

6969
// ------ toggle active button ------
7070

71-
GUILayout.BeginHorizontal(null);
71+
GUIUnstrip.BeginHorizontal();
7272
GUI.skin.button.alignment = TextAnchor.UpperLeft;
7373

7474
GUI.color = activeColor;
@@ -103,7 +103,7 @@ public static void GOButton_Impl(object _obj, Color activeColor, string label, b
103103
SmallInspectButton(_obj);
104104
}
105105

106-
GUILayout.EndHorizontal();
106+
GUIUnstrip.EndHorizontal();
107107
}
108108

109109
public static void SmallInspectButton(object obj)

‎src/Menu/MainMenu/MainMenu.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ private void MainWindow(int id)
8383

8484
private void MainHeader()
8585
{
86-
GUILayout.BeginHorizontal(null);
86+
GUIUnstrip.BeginHorizontal();
8787
for (int i = 0; i < Pages.Count; i++)
8888
{
8989
if (m_currentPage == i)
@@ -96,9 +96,9 @@ private void MainHeader()
9696
m_currentPage = i;
9797
}
9898
}
99-
GUILayout.EndHorizontal();
99+
GUIUnstrip.EndHorizontal();
100100

101-
GUILayout.BeginHorizontal(null);
101+
GUIUnstrip.BeginHorizontal();
102102
GUI.color = Color.white;
103103
InspectUnderMouse.EnableInspect = GUILayout.Toggle(InspectUnderMouse.EnableInspect, "Inspect Under Mouse (Shift + RMB)", null);
104104

@@ -107,7 +107,7 @@ private void MainHeader()
107107
if (setMouse != mouseState) CursorControl.ForceUnlockMouse = setMouse;
108108

109109
WindowManager.TabView = GUILayout.Toggle(WindowManager.TabView, "Tab View", null);
110-
GUILayout.EndHorizontal();
110+
GUIUnstrip.EndHorizontal();
111111

112112
//GUIUnstrip.Space(10);
113113
GUIUnstrip.Space(10);

0 commit comments

Comments
 (0)