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 daliCollu/unity-ui-extensions (pull request #36) 

Issue #239 fixed. https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/issues/239/swipe-threshold-value-seems-to-be-on
pull/413/head
durmuş ali çöllü 2018-11-13 13:29:44 +00:00 committed by Simon Jackson
parent c844807864 d9adaecfb7
commit 37aec29aa0
2 changed files with 75 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
Scripts/Layout/HorizontalScrollSnap.cs
View File

@ -239,31 +239,54 @@ namespace UnityEngine.UI.Extensions
if (_scroll_rect.horizontal)
{
var distance = Vector3.Distance(_startPosition, _screensContainer.localPosition);
if ((UseFastSwipe && distance < panelDimensions.width && distance >= FastSwipeThreshold) || UseHardSwipe)
{
if(UseHardSwipe){
_scroll_rect.velocity = Vector3.zero;
if (_startPosition.x - _screensContainer.localPosition.x > 0)
if (distance > FastSwipeThreshold)
{
if (_startPosition.x - _screensContainer.localPosition.x > _childSize / 3)
{
ScrollToClosestElement();
}
else
if (_startPosition.x - _screensContainer.localPosition.x > 0)
{
NextScreen();
}
}
else
{
if (_startPosition.x - _screensContainer.localPosition.x > -_childSize / 3)
{
ScrollToClosestElement();
}
else
{
PreviousScreen();
}
}
else
{
ScrollToClosestElement();
}
}
else
{
if (UseFastSwipe && distance < panelDimensions.width && distance >= FastSwipeThreshold )
{
_scroll_rect.velocity = Vector3.zero;
if (_startPosition.x - _screensContainer.localPosition.x > 0)
{
if (_startPosition.x - _screensContainer.localPosition.x > _childSize / 3)
{
ScrollToClosestElement();
}
else
{
NextScreen();
}
}
else
{
if (_startPosition.x - _screensContainer.localPosition.x > -_childSize / 3)
{
ScrollToClosestElement();
}
else
{
PreviousScreen();
}
}
}
}
}
}

52
Scripts/Layout/VerticalScrollSnap.cs
View File

@ -239,31 +239,53 @@ namespace UnityEngine.UI.Extensions
if (_scroll_rect.vertical)
{
var distance = Vector3.Distance(_startPosition, _screensContainer.localPosition);
if ((UseFastSwipe && distance < panelDimensions.height + FastSwipeThreshold && distance >=1f) || UseHardSwipe)
{
if(UseHardSwipe){
_scroll_rect.velocity = Vector3.zero;
if (_startPosition.y - _screensContainer.localPosition.y > 0)
if (distance > FastSwipeThreshold)
{
if (_startPosition.y - _screensContainer.localPosition.y > _childSize / 3)
{
ScrollToClosestElement();
}
else
if (_startPosition.y - _screensContainer.localPosition.y > 0)
{
NextScreen();
}
}
else
{
if (_startPosition.y - _screensContainer.localPosition.y > -_childSize / 3)
{
ScrollToClosestElement();
}
else
{
PreviousScreen();
}
}
else
{
ScrollToClosestElement();
}
}
else
{
if (UseFastSwipe && distance < panelDimensions.height + FastSwipeThreshold && distance >=1f)
{
_scroll_rect.velocity = Vector3.zero;
if (_startPosition.y - _screensContainer.localPosition.y > 0)
{
if (_startPosition.y - _screensContainer.localPosition.y > _childSize / 3)
{
ScrollToClosestElement();
}
else
{
NextScreen();
}
}
else
{
if (_startPosition.y - _screensContainer.localPosition.y > -_childSize / 3)
{
ScrollToClosestElement();
}
else
{
PreviousScreen();
}
}
}
}
}
}