pengtaihao
/
com.unity.uiextensions
mirror of https://github.com/Unity-UI-Extensions/com.unity.uiextensions
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged in fix/132-scrollsnapinfinite (pull request #75) 

fix: HSS/VSS ScrollSnap button fixes when infinite control applied
pull/413/head
Simon Jackson 2020-06-30 12:02:11 +00:00
parent f44afc7c6d d393830a1d
commit b8c655eb45
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Scripts/Layout/ScrollSnapBase.cs
View File

@ -317,7 +317,14 @@ namespace UnityEngine.UI.Extensions
if (!_lerp) StartScreenChange(); if (!_lerp) StartScreenChange();
_lerp = true; _lerp = true;
CurrentPage = _currentPage + 1; if (_isInfinite)
{
CurrentPage = GetPageforPosition(_screensContainer.anchoredPosition) + 1;
}
else
{
CurrentPage = _currentPage + 1;
}
GetPositionforPage(_currentPage, ref _lerp_target); GetPositionforPage(_currentPage, ref _lerp_target);
ScreenChange(); ScreenChange();
} }
@ -332,7 +339,14 @@ namespace UnityEngine.UI.Extensions
if (!_lerp) StartScreenChange(); if (!_lerp) StartScreenChange();
_lerp = true; _lerp = true;
CurrentPage = _currentPage - 1; if (_isInfinite)
{
CurrentPage = GetPageforPosition(_screensContainer.anchoredPosition) - 1;
}
else
{
CurrentPage = _currentPage - 1;
}
GetPositionforPage(_currentPage, ref _lerp_target); GetPositionforPage(_currentPage, ref _lerp_target);
ScreenChange(); ScreenChange();
} }
@ -508,7 +522,7 @@ namespace UnityEngine.UI.Extensions
var infiniteScroll = GetComponent<UI_InfiniteScroll>(); var infiniteScroll = GetComponent<UI_InfiniteScroll>();
if (ChildObjects != null && ChildObjects.Length > 0 && infiniteScroll != null && !infiniteScroll.InitByUser) if (ChildObjects != null && ChildObjects.Length > 0 && infiniteScroll != null && !infiniteScroll.InitByUser)
{ {
Debug.LogError("When using procedural children with a ScrollSnap (Adding Prefab ChildObjects) and the Infinite Scroll component\nYou must set the 'InitByUser' option to true, to enable late initialising"); Debug.LogError($"[{gameObject.name}]When using procedural children with a ScrollSnap (Adding Prefab ChildObjects) and the Infinite Scroll component\nYou must set the 'InitByUser' option to true, to enable late initialising");
} }
} }