Backups/UnityExplorer_Fix
1
0
Fork 0
mirror of https://github.com/GrahamKracker/UnityExplorer.git synced 2025-07-16 00:07:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

1.7.3

Browse Source 
* Reverted some unstrip fixes from 1.7.2 because it was causing more problems than it solved.
This commit is contained in:
sinaioutlander
2020-09-14 20:25:38 +10:00
parent 477a6859d7
commit 9bb3c77bae
26 changed files with 427 additions and 619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/CachedObjects/Object/CacheDictionary.cs
View File

@ -202,7 +202,7 @@ namespace Explorer
{
if (m_cachedKeys == null || m_cachedValues == null)
{
GUIUnstrip.Label("Cached keys or values is null!");
GUILayout.Label("Cached keys or values is null!", null);
return;
}
@ -212,14 +212,14 @@ namespace Explorer
if (!IsExpanded)
{
if (GUIUnstrip.Button("v", new GUILayoutOption[] { GUILayout.Width(25) }))
if (GUILayout.Button("v", new GUILayoutOption[] { GUILayout.Width(25) }))
{
IsExpanded = true;
}
}
else
{
if (GUIUnstrip.Button("^", new GUILayoutOption[] { GUILayout.Width(25) }))
if (GUILayout.Button("^", new GUILayoutOption[] { GUILayout.Width(25) }))
{
IsExpanded = false;
}
@ -229,7 +229,7 @@ namespace Explorer
GUI.skin.button.alignment = TextAnchor.MiddleLeft;
string btnLabel = $"[{count}] <color=#2df7b2>Dictionary<{TypeOfKeys.FullName}, {TypeOfValues.FullName}></color>";
if (GUIUnstrip.Button(btnLabel, new GUILayoutOption[] { GUILayout.Width(negativeWhitespace) }))
if (GUILayout.Button(btnLabel, new GUILayoutOption[] { GUILayout.Width(negativeWhitespace) }))
{
WindowManager.InspectObject(Value, out bool _);
}
@ -243,19 +243,19 @@ namespace Explorer
if (count > Pages.ItemsPerPage)
{
GUIUnstrip.EndHorizontal();
GUIUnstrip.BeginHorizontal();
GUILayout.EndHorizontal();
GUILayout.BeginHorizontal(null);
GUIUnstrip.Space(whitespace);
Pages.CurrentPageLabel();
// prev/next page buttons
if (GUIUnstrip.Button("< Prev", new GUILayoutOption[] { GUILayout.Width(60) }))
if (GUILayout.Button("< Prev", new GUILayoutOption[] { GUILayout.Width(60) }))
{
Pages.TurnPage(Turn.Left);
}
if (GUIUnstrip.Button("Next >", new GUILayoutOption[] { GUILayout.Width(60) }))
if (GUILayout.Button("Next >", new GUILayoutOption[] { GUILayout.Width(60) }))
{
Pages.TurnPage(Turn.Right);
}
@ -273,24 +273,24 @@ namespace Explorer
var val = m_cachedValues[i];
//collapsing the BeginHorizontal called from ReflectionWindow.WindowFunction or previous array entry
GUIUnstrip.EndHorizontal();
GUIUnstrip.BeginHorizontal();
GUILayout.EndHorizontal();
GUILayout.BeginHorizontal(null);
//GUIUnstrip.Space(whitespace);
if (key == null || val == null)
{
GUIUnstrip.Label($"[{i}] <i><color=grey>(null)</color></i>");
GUILayout.Label($"[{i}] <i><color=grey>(null)</color></i>", null);
}
else
{
GUI.skin.label.alignment = TextAnchor.MiddleCenter;
GUIUnstrip.Label($"[{i}]", new GUILayoutOption[] { GUILayout.Width(30) });
GUILayout.Label($"[{i}]", new GUILayoutOption[] { GUILayout.Width(30) });
GUIUnstrip.Label("Key:", new GUILayoutOption[] { GUILayout.Width(40) });
GUILayout.Label("Key:", new GUILayoutOption[] { GUILayout.Width(40) });
key.DrawValue(window, (window.width / 2) - 30f);
GUIUnstrip.Label("Value:", new GUILayoutOption[] { GUILayout.Width(40) });
GUILayout.Label("Value:", new GUILayoutOption[] { GUILayout.Width(40) });
val.DrawValue(window, (window.width / 2) - 30f);
}

24
src/CachedObjects/Object/CacheList.cs
View File

@ -264,7 +264,7 @@ namespace Explorer
{
if (m_cachedEntries == null)
{
GUIUnstrip.Label("m_cachedEntries is null!");
GUILayout.Label("m_cachedEntries is null!", null);
return;
}
@ -274,14 +274,14 @@ namespace Explorer
if (!IsExpanded)
{
if (GUIUnstrip.Button("v", new GUILayoutOption[] { GUILayout.Width(25) }))
if (GUILayout.Button("v", new GUILayoutOption[] { GUILayout.Width(25) }))
{
IsExpanded = true;
}
}
else
{
if (GUIUnstrip.Button("^", new GUILayoutOption[] { GUILayout.Width(25) }))
if (GUILayout.Button("^", new GUILayoutOption[] { GUILayout.Width(25) }))
{
IsExpanded = false;
}
@ -291,7 +291,7 @@ namespace Explorer
GUI.skin.button.alignment = TextAnchor.MiddleLeft;
string btnLabel = $"[{count}] <color=#2df7b2>{EntryType.FullName}</color>";
if (GUIUnstrip.Button(btnLabel, new GUILayoutOption[] { GUILayout.MaxWidth(negativeWhitespace) }))
if (GUILayout.Button(btnLabel, new GUILayoutOption[] { GUILayout.MaxWidth(negativeWhitespace) }))
{
WindowManager.InspectObject(Value, out bool _);
}
@ -305,19 +305,19 @@ namespace Explorer
if (count > Pages.ItemsPerPage)
{
GUIUnstrip.EndHorizontal();
GUIUnstrip.BeginHorizontal();
GUILayout.EndHorizontal();
GUILayout.BeginHorizontal(null);
GUIUnstrip.Space(whitespace);
Pages.CurrentPageLabel();
// prev/next page buttons
if (GUIUnstrip.Button("< Prev", new GUILayoutOption[] { GUILayout.Width(60) }))
if (GUILayout.Button("< Prev", new GUILayoutOption[] { GUILayout.Width(60) }))
{
Pages.TurnPage(Turn.Left);
}
if (GUIUnstrip.Button("Next >", new GUILayoutOption[] { GUILayout.Width(60) }))
if (GUILayout.Button("Next >", new GUILayoutOption[] { GUILayout.Width(60) }))
{
Pages.TurnPage(Turn.Right);
}
@ -334,19 +334,19 @@ namespace Explorer
var entry = m_cachedEntries[i];
//collapsing the BeginHorizontal called from ReflectionWindow.WindowFunction or previous array entry
GUIUnstrip.EndHorizontal();
GUIUnstrip.BeginHorizontal();
GUILayout.EndHorizontal();
GUILayout.BeginHorizontal(null);
GUIUnstrip.Space(whitespace);
if (entry == null || entry.Value == null)
{
GUIUnstrip.Label($"[{i}] <i><color=grey>(null)</color></i>");
GUILayout.Label($"[{i}] <i><color=grey>(null)</color></i>", null);
}
else
{
GUI.skin.label.alignment = TextAnchor.MiddleCenter;
GUIUnstrip.Label($"[{i}]", new GUILayoutOption[] { GUILayout.Width(30) });
GUILayout.Label($"[{i}]", new GUILayoutOption[] { GUILayout.Width(30) });
entry.DrawValue(window, window.width - (whitespace + 85));
}