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

Cleanup and fix some small issues with scroll pool

Browse Source
This commit is contained in:
Sinai
2021-04-21 23:07:15 +10:00
parent 0a9639f8a9
commit edbb9a2882
12 changed files with 174 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/UI/Panels/InspectorTest.cs
View File

@ -168,34 +168,54 @@ namespace UnityExplorer.UI.Panels
public int ItemCount => Inspector.dummyContents.Count;
public void OnDisableCell(CellViewHolder cell, int dataIndex)
{
if (cell.UIRoot.transform.Find("Content") is Transform existing)
existing.transform.SetParent(Inspector.dummyContentHolder.transform, false);
}
public void Init()
{
var prototype = DynamicCell.CreatePrototypeCell(Scroller.UIRoot);
var prototype = CellViewHolder.CreatePrototypeCell(Scroller.UIRoot);
Scroller.DataSource = this;
Scroller.Initialize(this, prototype);
}
public ICell CreateCell(RectTransform cellTransform) => new DynamicCell(cellTransform.gameObject);
public ICell CreateCell(RectTransform cellTransform) => new CellViewHolder(cellTransform.gameObject);
public void DisableCell(ICell icell, int index)
{
var root = (icell as CellViewHolder).UIRoot;
DisableContent(root);
icell.Disable();
}
public void SetCell(ICell icell, int index)
{
var root = (icell as CellViewHolder).UIRoot;
if (index < 0 || index >= ItemCount)
{
DisableContent(root);
icell.Disable();
return;
}
var root = (icell as DynamicCell).uiRoot;
var content = Inspector.dummyContents[index];
if (content.transform.parent.ReferenceEqual(root.transform))
return;
if (root.transform.Find("Content") is Transform existing)
existing.transform.SetParent(Inspector.dummyContentHolder.transform, false);
DisableContent(root);
content.transform.SetParent(root.transform, false);
}
private void DisableContent(GameObject cellRoot)
{
if (cellRoot.transform.Find("Content") is Transform existing)
existing.transform.SetParent(Inspector.dummyContentHolder.transform, false);
}
}
}

81
src/UI/Panels/SceneExplorer.cs
View File

@ -128,26 +128,26 @@ namespace UnityExplorer.UI.Panels
Tree.RefreshData(true);
}
private float highestRectHeight;
//private float highestRectHeight;
public override void OnFinishResize(RectTransform panel)
{
base.OnFinishResize(panel);
RuntimeProvider.Instance.StartCoroutine(DelayedRefresh(panel));
}
//public override void OnFinishResize(RectTransform panel)
//{
// base.OnFinishResize(panel);
// RuntimeProvider.Instance.StartCoroutine(DelayedRefresh(panel));
//}
private IEnumerator DelayedRefresh(RectTransform obj)
{
yield return null;
//private IEnumerator DelayedRefresh(RectTransform obj)
//{
// yield return null;
if (obj.rect.height > highestRectHeight)
{
// height increased, hard refresh required.
highestRectHeight = obj.rect.height;
//Tree.Scroller.ReloadData();
}
Tree.Scroller.RefreshCells(true);
}
// if (obj.rect.height > highestRectHeight)
// {
// // height increased, hard refresh required.
// highestRectHeight = obj.rect.height;
// //Tree.Scroller.ReloadData();
// }
// Tree.Scroller.RefreshCells(true);
//}
public override void SaveToConfigManager()
{
@ -192,10 +192,6 @@ namespace UnityExplorer.UI.Panels
var filterRow = UIFactory.CreateHorizontalGroup(toolbar, "FilterGroup", true, true, true, true, 2, new Vector4(2, 2, 2, 2));
UIFactory.SetLayoutElement(filterRow, minHeight: 25, flexibleHeight: 0);
//// filter label
//var label = UIFactory.CreateLabel(filterRow, "FilterLabel", "Search:", TextAnchor.MiddleLeft);
//UIFactory.SetLayoutElement(label.gameObject, minWidth: 50, flexibleWidth: 0);
//Filter input field
var inputFieldObj = UIFactory.CreateInputField(filterRow, "FilterInput", "Search...", out InputField inputField, 13);
inputField.targetGraphic.color = new Color(0.2f, 0.2f, 0.2f);
@ -224,23 +220,23 @@ namespace UnityExplorer.UI.Panels
// Transform Tree
//var prototype = TransformCell.CreatePrototypeCell(scrollContent);
var infiniteScroll = UIFactory.CreateScrollPool(content, "TransformTree", out GameObject scrollObj,
out GameObject scrollContent, new Color(0.15f, 0.15f, 0.15f));
UIFactory.SetLayoutElement(scrollObj, flexibleHeight: 9999);
UIFactory.SetLayoutElement(scrollContent, flexibleHeight: 9999);
// Prototype tree cell
//infiniteScroll.PrototypeCell = prototype.GetComponent<RectTransform>();
Tree = new TransformTree(infiniteScroll) { GetRootEntriesMethod = GetRootEntries };
Tree.Init();
// some references
highestRectHeight = mainPanelRect.rect.height;
// Scene Loader
ConstructSceneLoader();
}
private const string DEFAULT_LOAD_TEXT = "[Select a scene]";
private void ConstructSceneLoader()
{
// Scene Loader
try
{
@ -256,7 +252,7 @@ namespace UnityExplorer.UI.Panels
var allSceneDropObj = UIFactory.CreateDropdown(sceneLoaderObj, out Dropdown allSceneDrop, "", 14, null);
UIFactory.SetLayoutElement(allSceneDropObj, minHeight: 25, minWidth: 150, flexibleWidth: 0, flexibleHeight: 0);
allSceneDrop.options.Add(new Dropdown.OptionData("[Select a scene]"));
allSceneDrop.options.Add(new Dropdown.OptionData(DEFAULT_LOAD_TEXT));
foreach (var scene in SceneHandler.AllSceneNames)
allSceneDrop.options.Add(new Dropdown.OptionData(Path.GetFileNameWithoutExtension(scene)));
@ -277,20 +273,41 @@ namespace UnityExplorer.UI.Panels
TryLoadScene(LoadSceneMode.Additive, allSceneDrop);
}, new Color(0.1f, 0.3f, 0.3f));
UIFactory.SetLayoutElement(loadAdditiveButton.gameObject, minHeight: 25, minWidth: 150);
var disabledColor = new Color(0.24f, 0.24f, 0.24f);
RuntimeProvider.Instance.SetColorBlock(loadButton, disabled: disabledColor);
RuntimeProvider.Instance.SetColorBlock(loadAdditiveButton, disabled: disabledColor);
loadButton.interactable = false;
loadAdditiveButton.interactable = false;
allSceneDrop.onValueChanged.AddListener((int val) =>
{
var text = allSceneDrop.options[val].text;
if (text == DEFAULT_LOAD_TEXT)
{
loadButton.interactable = false;
loadAdditiveButton.interactable = false;
}
else
{
loadButton.interactable = true;
loadAdditiveButton.interactable = true;
}
});
}
}
catch (Exception ex)
{
ExplorerCore.LogWarning($"Could not create the Scene Loader helper! {ex.ReflectionExToString()}");
}
}
private void TryLoadScene(LoadSceneMode mode, Dropdown allSceneDrop)
{
var text = allSceneDrop.options[allSceneDrop.value].text;
if (text == "[Select a scene]")
if (text == DEFAULT_LOAD_TEXT)
return;
try