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

some UI cleanups

Browse Source
This commit is contained in:
sinaioutlander
2020-11-14 00:46:26 +11:00
parent e9acd68ee4
commit 60580c8183
13 changed files with 64 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/CSConsole/AutoCompleter.cs
View File

@ -132,7 +132,7 @@ namespace UnityExplorer.CSConsole
{
try
{
var editor = ConsolePage.Instance.m_codeEditor;
var editor = CSConsolePage.Instance.m_codeEditor;
if (!editor.InputField.isFocused)
return;
@ -164,7 +164,7 @@ namespace UnityExplorer.CSConsole
public static void CheckAutocomplete()
{
var m_codeEditor = ConsolePage.Instance.m_codeEditor;
var m_codeEditor = CSConsolePage.Instance.m_codeEditor;
string input = m_codeEditor.InputField.text;
int caretIndex = m_codeEditor.InputField.caretPosition;
@ -204,7 +204,7 @@ namespace UnityExplorer.CSConsole
{
// Credit ManylMarco
CodeEditor.AutoCompletes.Clear();
string[] completions = ConsolePage.Instance.m_evaluator.GetCompletions(input, out string prefix);
string[] completions = CSConsolePage.Instance.m_evaluator.GetCompletions(input, out string prefix);
if (completions != null)
{
if (prefix == null)
@ -301,7 +301,7 @@ namespace UnityExplorer.CSConsole
void UseAutocompleteButton()
{
ConsolePage.Instance.m_codeEditor.UseAutocomplete(hiddenText.text);
CSConsolePage.Instance.m_codeEditor.UseAutocomplete(hiddenText.text);
}
m_suggestionButtons.Add(buttonObj);

20
src/CSConsole/CodeEditor.cs
View File

@ -86,7 +86,7 @@ The following helper methods are available:
var text = InputField.text.Trim();
if (!string.IsNullOrEmpty(text))
{
ConsolePage.Instance.Evaluate(text);
CSConsolePage.Instance.Evaluate(text);
return;
}
}
@ -105,7 +105,7 @@ The following helper methods are available:
{
if (!m_fixwanted)
{
EventSystem.current.SetSelectedGameObject(ConsolePage.Instance.m_codeEditor.InputField.gameObject, null);
EventSystem.current.SetSelectedGameObject(CSConsolePage.Instance.m_codeEditor.InputField.gameObject, null);
m_fixwanted = true;
}
else
@ -308,13 +308,13 @@ The following helper methods are available:
public void ConstructUI()
{
ConsolePage.Instance.Content = UIFactory.CreateUIObject("C# Console", MainMenu.Instance.PageViewport);
CSConsolePage.Instance.Content = UIFactory.CreateUIObject("C# Console", MainMenu.Instance.PageViewport);
var mainLayout = ConsolePage.Instance.Content.AddComponent<LayoutElement>();
mainLayout.preferredHeight = 9900;
var mainLayout = CSConsolePage.Instance.Content.AddComponent<LayoutElement>();
mainLayout.preferredHeight = 500;
mainLayout.flexibleHeight = 9000;
var mainGroup = ConsolePage.Instance.Content.AddComponent<VerticalLayoutGroup>();
var mainGroup = CSConsolePage.Instance.Content.AddComponent<VerticalLayoutGroup>();
mainGroup.childControlHeight = true;
mainGroup.childControlWidth = true;
mainGroup.childForceExpandHeight = true;
@ -324,7 +324,7 @@ The following helper methods are available:
// Main group object
var topBarObj = UIFactory.CreateHorizontalGroup(ConsolePage.Instance.Content);
var topBarObj = UIFactory.CreateHorizontalGroup(CSConsolePage.Instance.Content);
LayoutElement topBarLayout = topBarObj.AddComponent<LayoutElement>();
topBarLayout.minHeight = 50;
topBarLayout.flexibleHeight = 0;
@ -402,7 +402,7 @@ The following helper methods are available:
int fontSize = 16;
var inputObj = UIFactory.CreateSrollInputField(ConsolePage.Instance.Content, out InputFieldScroller consoleScroll, fontSize);
var inputObj = UIFactory.CreateSrollInputField(CSConsolePage.Instance.Content, out InputFieldScroller consoleScroll, fontSize);
var inputField = consoleScroll.inputField;
@ -431,7 +431,7 @@ The following helper methods are available:
#region COMPILE BUTTON
var compileBtnObj = UIFactory.CreateButton(ConsolePage.Instance.Content);
var compileBtnObj = UIFactory.CreateButton(CSConsolePage.Instance.Content);
var compileBtnLayout = compileBtnObj.AddComponent<LayoutElement>();
compileBtnLayout.preferredWidth = 80;
compileBtnLayout.flexibleWidth = 0;
@ -452,7 +452,7 @@ The following helper methods are available:
{
if (!string.IsNullOrEmpty(inputField.text))
{
ConsolePage.Instance.Evaluate(inputField.text.Trim());
CSConsolePage.Instance.Evaluate(inputField.text.Trim());
}
}

6
src/CSConsole/ScriptInteraction.cs
View File

@ -15,17 +15,17 @@ namespace UnityExplorer.CSConsole
public static void AddUsing(string directive)
{
ConsolePage.Instance.AddUsing(directive);
CSConsolePage.Instance.AddUsing(directive);
}
public static void GetUsing()
{
ExplorerCore.Log(ConsolePage.Instance.m_evaluator.GetUsing());
ExplorerCore.Log(CSConsolePage.Instance.m_evaluator.GetUsing());
}
public static void Reset()
{
ConsolePage.Instance.ResetConsole();
CSConsolePage.Instance.ResetConsole();
}
public static object CurrentTarget()