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

More progress, and change Aggressive Mouse Unlock behaviour

Browse Source
This commit is contained in:
Sinai
2021-04-29 21:01:08 +10:00
parent a2a2b09d33
commit dba9bdbdc2
22 changed files with 365 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -185,7 +185,7 @@ namespace UnityExplorer.UI.Widgets.AutoComplete
UIRoot.SetActive(false);
}
public override void SaveToConfigManager()
public override void DoSaveToConfigElement()
{
// not savable
}

2
src/UI/Widgets/ButtonList/ButtonListSource.cs
View File

@ -85,6 +85,6 @@ namespace UnityExplorer.UI.Widgets
}
}
public void DisableCell(ButtonCell cell, int index) => cell.Disable();
//public void DisableCell(ButtonCell cell, int index) => cell.Disable();
}
}

2
src/UI/Widgets/ScrollPool/IPoolDataSource.cs
View File

@ -14,6 +14,6 @@ namespace UnityExplorer.UI.Widgets
void OnCellReturned(T cell);
void SetCell(T cell, int index);
void DisableCell(T cell, int index);
//void DisableCell(T cell, int index);
}
}

52
src/UI/Widgets/ScrollPool/ScrollPool.cs
View File

@ -134,7 +134,7 @@ namespace UnityExplorer.UI.Widgets
SetRecycleViewBounds(false);
SetScrollBounds();
RecreateCellPool(true, true);
ExtendCellPool();
writingLocked = false;
Content.anchoredPosition = Vector2.zero;
UpdateSliderHandle(true);
@ -244,7 +244,6 @@ namespace UnityExplorer.UI.Widgets
var cell = Pool<T>.Borrow();
DataSource.OnCellBorrowed(cell);
//var rect = cell.Rect;
CellPool.Add(cell);
cell.Rect.SetParent(ScrollRect.content, false);
@ -262,48 +261,53 @@ namespace UnityExplorer.UI.Widgets
SetCell(CellPool[enumerator.Current.cellIndex], enumerator.Current.dataIndex);
}
/// <summary>ret = cell pool was extended</summary>
private bool SetRecycleViewBounds(bool checkHeightGrow)
private void SetRecycleViewBounds(bool extendPoolIfGrown)
{
bool ret = false;
RecycleViewBounds = new Vector2(Viewport.MinY() + HalfThreshold, Viewport.MaxY() - HalfThreshold);
if (checkHeightGrow && prevViewportHeight < Viewport.rect.height && prevViewportHeight != 0.0f)
ret = RecreateCellPool(false, false);
if (extendPoolIfGrown && prevViewportHeight < Viewport.rect.height && prevViewportHeight != 0.0f)
ExtendCellPool();
prevViewportHeight = Viewport.rect.height;
return ret;
}
private bool RecreateCellPool(bool forceRecreate, bool resetDataIndex)
private bool ExtendCellPool()
{
CheckDataSourceCountChange(out _);
var requiredCoverage = Math.Abs(RecycleViewBounds.y - RecycleViewBounds.x);
var currentCoverage = CellPool.Count * PrototypeHeight;
int cellsRequired = (int)Math.Floor((decimal)(requiredCoverage - currentCoverage) / (decimal)PrototypeHeight);
if (cellsRequired > 0 || forceRecreate)
if (cellsRequired > 0)
{
WritingLocked = true;
bottomDataIndex += cellsRequired;
int maxDataIndex = Math.Max(CellPool.Count + cellsRequired - 1, DataSource.ItemCount - 1);
if (bottomDataIndex > maxDataIndex)
bottomDataIndex = maxDataIndex;
float curAnchor = Content.localPosition.y;
float curHeight = Content.rect.height;
float prevAnchor = Content.localPosition.y;
float prevHeight = Content.rect.height;
CreateCellPool(resetDataIndex);
// fix slight jumping when resizing panel and size increases
if (Content.rect.height != curHeight)
for (int i = 0; i < cellsRequired; i++)
{
var diff = Content.rect.height - curHeight;
Content.localPosition = new Vector3(Content.localPosition.x, Content.localPosition.y + (diff * 0.5f));
var cell = Pool<T>.Borrow();
DataSource.OnCellBorrowed(cell);
cell.Rect.SetParent(ScrollRect.content, false);
CellPool.Add(cell);
if (CellPool.Count > 1)
{
int index = CellPool.Count - 1 - (topPoolIndex % (CellPool.Count - 1));
cell.Rect.SetSiblingIndex(index);
}
}
RefreshCells(true);
if (Content.localPosition.y != prevAnchor)
{
var diff = Content.localPosition.y - prevAnchor;
Content.localPosition = new Vector3(Content.localPosition.x, Content.localPosition.y - diff);
}
ScrollRect.UpdatePrevData();
@ -321,7 +325,7 @@ namespace UnityExplorer.UI.Widgets
private CellInfo _cellInfo = new CellInfo();
private IEnumerator<CellInfo> GetPoolEnumerator()
public IEnumerator<CellInfo> GetPoolEnumerator()
{
int cellIdx = topPoolIndex;
int dataIndex = TopDataIndex;

2
src/UI/Widgets/TransformTree/TransformTree.cs
View File

@ -55,7 +55,7 @@ namespace UnityExplorer.UI.Widgets
ScrollPool.Initialize(this);
}
public void DisableCell(TransformCell cell, int index) => cell.Disable();
//public void DisableCell(TransformCell cell, int index) => cell.Disable();
public bool IsCellExpanded(int instanceID)