ScrollConflictManager.cs edited online with Bitbucket now works with scrollsnap Horizontal and calls the appropriate events
parent
84c030278b
commit
0331d960e1
|
@ -15,6 +15,7 @@ namespace UnityEngine.UI.Extensions
|
||||||
public class ScrollConflictManager : MonoBehaviour, IBeginDragHandler, IEndDragHandler, IDragHandler
|
public class ScrollConflictManager : MonoBehaviour, IBeginDragHandler, IEndDragHandler, IDragHandler
|
||||||
{
|
{
|
||||||
public ScrollRect ParentScrollRect;
|
public ScrollRect ParentScrollRect;
|
||||||
|
public HorizontalScrollSnap ParentScrollSnapHorizontal;
|
||||||
private ScrollRect _myScrollRect;
|
private ScrollRect _myScrollRect;
|
||||||
private IBeginDragHandler[] _beginDragHandlers;
|
private IBeginDragHandler[] _beginDragHandlers;
|
||||||
private IEndDragHandler[] _endDragHandlers;
|
private IEndDragHandler[] _endDragHandlers;
|
||||||
|
@ -67,6 +68,7 @@ namespace UnityEngine.UI.Extensions
|
||||||
for (int i = 0, length = _beginDragHandlers.Length; i < length; i++)
|
for (int i = 0, length = _beginDragHandlers.Length; i < length; i++)
|
||||||
{
|
{
|
||||||
_beginDragHandlers[i].OnBeginDrag(eventData);
|
_beginDragHandlers[i].OnBeginDrag(eventData);
|
||||||
|
ParentScrollSnapHorizontal.OnBeginDrag(eventData);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -78,6 +80,7 @@ namespace UnityEngine.UI.Extensions
|
||||||
for (int i = 0, length = _beginDragHandlers.Length; i < length; i++)
|
for (int i = 0, length = _beginDragHandlers.Length; i < length; i++)
|
||||||
{
|
{
|
||||||
_beginDragHandlers[i].OnBeginDrag(eventData);
|
_beginDragHandlers[i].OnBeginDrag(eventData);
|
||||||
|
ParentScrollSnapHorizontal.OnBeginDrag(eventData);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -92,6 +95,7 @@ namespace UnityEngine.UI.Extensions
|
||||||
for (int i = 0, length = _endDragHandlers.Length; i < length; i++)
|
for (int i = 0, length = _endDragHandlers.Length; i < length; i++)
|
||||||
{
|
{
|
||||||
_endDragHandlers[i].OnEndDrag(eventData);
|
_endDragHandlers[i].OnEndDrag(eventData);
|
||||||
|
ParentScrollSnapHorizontal.OnEndDrag(eventData);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -104,6 +108,7 @@ namespace UnityEngine.UI.Extensions
|
||||||
for (int i = 0, length = _endDragHandlers.Length; i < length; i++)
|
for (int i = 0, length = _endDragHandlers.Length; i < length; i++)
|
||||||
{
|
{
|
||||||
_dragHandlers[i].OnDrag(eventData);
|
_dragHandlers[i].OnDrag(eventData);
|
||||||
|
ParentScrollSnapHorizontal.OnDrag(eventData);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue