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

Code cleanup

Browse Source
This commit is contained in:
Sinai
2022-04-12 00:17:06 +10:00
parent 47629d4764
commit f19a1dd25e
10 changed files with 34 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/UI/Panels/AutoCompleteModal.cs
View File

@ -14,6 +14,7 @@ using UniverseLib.UI;
using UniverseLib.UI.Widgets.ButtonList;
using UniverseLib.UI.Widgets.ScrollView;
using UniverseLib.Utility;
using UniverseLib.UI.Models;
namespace UnityExplorer.UI.Widgets.AutoComplete
{
@ -53,7 +54,7 @@ namespace UnityExplorer.UI.Widgets.AutoComplete
OnClickedOutsidePanels += AutoCompleter_OnClickedOutsidePanels;
}
public void TakeOwnership(ISuggestionProvider provider)
public static void TakeOwnership(ISuggestionProvider provider)
{
CurrentHandler = provider;
navigationTipRow.SetActive(provider.AllowNavigation);
@ -152,7 +153,8 @@ namespace UnityExplorer.UI.Widgets.AutoComplete
return;
SelectedIndex = index;
scrollPool.Refresh(true, false);
scrollPool.JumpToIndex(index, null);
}
// Internal update
@ -173,8 +175,8 @@ namespace UnityExplorer.UI.Widgets.AutoComplete
// Setting autocomplete cell buttons
private readonly Color selectedSuggestionColor = new Color(45 / 255f, 75 / 255f, 80 / 255f);
private readonly Color inactiveSuggestionColor = new Color(0.11f, 0.11f, 0.11f);
private readonly Color selectedSuggestionColor = new(45 / 255f, 75 / 255f, 80 / 255f);
private readonly Color inactiveSuggestionColor = new(0.11f, 0.11f, 0.11f);
private List<Suggestion> GetEntries() => Suggestions;
@ -201,21 +203,6 @@ namespace UnityExplorer.UI.Widgets.AutoComplete
if (CurrentHandler.AllowNavigation && index == SelectedIndex && setFirstCell)
{
float diff = 0f;
// if cell is too far down
if (cell.Rect.MinY() > scrollPool.Viewport.MinY())
diff = cell.Rect.MinY() - scrollPool.Viewport.MinY();
// if cell is too far up
else if (cell.Rect.MaxY() < scrollPool.Viewport.MaxY())
diff = cell.Rect.MaxY() - scrollPool.Viewport.MaxY();
if (diff != 0.0f)
{
var pos = scrollPool.Content.anchoredPosition;
pos.y -= diff;
scrollPool.Content.anchoredPosition = pos;
}
RuntimeHelper.SetColorBlock(cell.Button.Component, selectedSuggestionColor);
}
else
@ -234,9 +221,9 @@ namespace UnityExplorer.UI.Widgets.AutoComplete
if (CurrentHandler == null)
return;
var input = CurrentHandler.InputField;
InputFieldRef input = CurrentHandler.InputField;
if (input.Component.caretPosition == lastCaretPosition && input.UIRoot.transform.position == lastInputPosition)
if (!input.Component.isFocused || input.Component.caretPosition == lastCaretPosition && input.UIRoot.transform.position == lastInputPosition)
return;
lastInputPosition = input.UIRoot.transform.position;
lastCaretPosition = input.Component.caretPosition;
@ -257,9 +244,6 @@ namespace UnityExplorer.UI.Widgets.AutoComplete
else
{
uiRoot.transform.position = input.Transform.position + new Vector3(-(input.Transform.rect.width / 2) + 10, -20, 0);
//var textGen = input.Component.textComponent.cachedTextGenerator;
//var pos = input.UIRoot.transform.TransformPoint(textGen.characters[0].cursorPos);
//uiRoot.transform.position = new Vector3(pos.x + 10, pos.y - 20, 0);
}
this.Dragger.OnEndResize();

2
src/UI/Panels/UiInspectorResultsPanel.cs → src/UI/Panels/MouseInspectorResultsPanel.cs
View File

@ -14,7 +14,7 @@ using UniverseLib.Utility;
namespace UnityExplorer.UI.Panels
{
public class UiInspectorResultsPanel : UIPanel
public class MouseInspectorResultsPanel : UIPanel
{
public override UIManager.Panels PanelType => UIManager.Panels.UIInspectorResults;

6
src/UI/Panels/UIPanel.cs
View File

@ -37,18 +37,18 @@ namespace UnityExplorer.UI.Panels
&& (InputManager.GetMouseButtonDown(0) || InputManager.GetMouseButtonDown(1)))
{
int count = UIManager.PanelHolder.transform.childCount;
var mousePos = DisplayManager.MousePosition;
Vector3 mousePos = DisplayManager.MousePosition;
bool clickedInAny = false;
for (int i = count - 1; i >= 0; i--)
{
// make sure this is a real recognized panel
var transform = UIManager.PanelHolder.transform.GetChild(i);
Transform transform = UIManager.PanelHolder.transform.GetChild(i);
if (!transformToPanelDict.TryGetValue(transform.GetInstanceID(), out UIPanel panel))
continue;
// check if our mouse is clicking inside the panel
var pos = panel.Rect.InverseTransformPoint(mousePos);
Vector3 pos = panel.Rect.InverseTransformPoint(mousePos);
if (!panel.Enabled || !panel.Rect.rect.Contains(pos))
continue;

2
src/UI/UIManager.cs
View File

@ -105,7 +105,7 @@ namespace UnityExplorer.UI
UIPanels.Add(Panels.Clipboard, new ClipboardPanel());
UIPanels.Add(Panels.ConsoleLog, new LogPanel());
UIPanels.Add(Panels.Options, new OptionsPanel());
UIPanels.Add(Panels.UIInspectorResults, new UiInspectorResultsPanel());
UIPanels.Add(Panels.UIInspectorResults, new MouseInspectorResultsPanel());
UIPanels.Add(Panels.MouseInspector, new MouseInspector());
foreach (var panel in UIPanels.Values)

4
src/UI/Widgets/AutoComplete/EnumCompleter.cs
View File

@ -101,7 +101,7 @@ namespace UnityExplorer.UI.Widgets.AutoComplete
public void HelperButtonClicked()
{
GetSuggestions("");
AutoCompleteModal.Instance.TakeOwnership(this);
AutoCompleteModal.TakeOwnership(this);
AutoCompleteModal.Instance.SetSuggestions(suggestions);
}
@ -119,7 +119,7 @@ namespace UnityExplorer.UI.Widgets.AutoComplete
{
GetSuggestions(value);
AutoCompleteModal.Instance.TakeOwnership(this);
AutoCompleteModal.TakeOwnership(this);
AutoCompleteModal.Instance.SetSuggestions(suggestions);
}
}

2
src/UI/Widgets/AutoComplete/TypeCompleter.cs
View File

@ -106,7 +106,7 @@ namespace UnityExplorer.UI.Widgets.AutoComplete
{
GetSuggestions(value);
AutoCompleteModal.Instance.TakeOwnership(this);
AutoCompleteModal.TakeOwnership(this);
AutoCompleteModal.Instance.SetSuggestions(suggestions);
}
}