https://github.com/qiankanglai/LoopScrollRect/issues/5

Fix GridLayout, thanks to @wumiliu
zuohu · Sep 20, 2016 · 4902dae · 4902dae
1 parent 753ab70
commit 4902dae
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 10 deletions.
diff --git a/Assets/Scripts/LoopHorizontalScrollRect.cs b/Assets/Scripts/LoopHorizontalScrollRect.cs
@@ -1,13 +1,22 @@
 using UnityEngine;
 using System.Collections;
-
+
 namespace UnityEngine.UI
 {
     public class LoopHorizontalScrollRect : LoopScrollRect
     {
         protected override float GetSize(RectTransform item)
         {
-            return LayoutUtility.GetPreferredWidth(item) + contentSpacing;
+            float size = contentSpacing;
+            if (m_GridLayout != null)
+            {
+                size += m_GridLayout.cellSize.x;
+            }
+            else
+            {
+                size += LayoutUtility.GetPreferredWidth(item);
+            }
+            return size;
         }
 
         protected override float GetDimension(Vector2 vector)

diff --git a/Assets/Scripts/LoopScrollRect.cs b/Assets/Scripts/LoopScrollRect.cs
@@ -35,6 +35,7 @@ public abstract class LoopScrollRect : UIBehaviour, IInitializePotentialDragHand
         protected int directionSign = 0;
 
         private float m_ContentSpacing = -1;
+        protected GridLayoutGroup m_GridLayout = null;
         protected float contentSpacing
         {
             get
@@ -51,13 +52,10 @@ protected float contentSpacing
                     {
                         m_ContentSpacing = layout1.spacing;
                     }
-                    else
+                    m_GridLayout = content.GetComponent<GridLayoutGroup>();
+                    if (m_GridLayout != null)
                     {
-                        GridLayoutGroup layout2 = content.GetComponent<GridLayoutGroup>();
-                        if (layout2 != null)
-                        {
-                            m_ContentSpacing = GetDimension(layout2.spacing);
-                        }
+                        m_ContentSpacing = GetDimension(m_GridLayout.spacing);
                     }
                 }
                 return m_ContentSpacing;

diff --git a/Assets/Scripts/LoopVerticalScrollRect.cs b/Assets/Scripts/LoopVerticalScrollRect.cs
@@ -1,14 +1,23 @@
 using UnityEngine;
 using UnityEngine.UI;
 using System.Collections;
-
+
 namespace UnityEngine.UI
 {
     public class LoopVerticalScrollRect : LoopScrollRect
     {
         protected override float GetSize(RectTransform item)
         {
-            return LayoutUtility.GetPreferredHeight(item) + contentSpacing;
+            float size = contentSpacing;
+            if (m_GridLayout != null)
+            {
+                size += m_GridLayout.cellSize.y;
+            }
+            else
+            {
+                size += LayoutUtility.GetPreferredHeight(item);
+            }
+            return size;
         }
 
         protected override float GetDimension(Vector2 vector)