fix issue #178: GridLayout may increase totalCount at any time, so …

…fill last row when possible
qiankanglai · Sep 7, 2024 · ed00b08 · ed00b08
1 parent 08ac1cf
commit ed00b08
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 1 deletion.
diff --git a/Runtime/LoopHorizontalScrollRect.cs b/Runtime/LoopHorizontalScrollRect.cs
@@ -132,6 +132,10 @@ protected override bool UpdateItems(ref Bounds viewBounds, ref Bounds contentBou
                 if (totalSize > 0)
                     changed = true;
             }
+            else if ((itemTypeEnd % contentConstraintCount != 0) && (itemTypeEnd < totalCount || totalCount < 0))
+            {
+                NewItemAtEnd();
+            }
 
             if (viewBounds.min.x < contentBounds.min.x + m_ContentLeftPadding)
             {

diff --git a/Runtime/LoopHorizontalScrollRectMulti.cs b/Runtime/LoopHorizontalScrollRectMulti.cs
@@ -132,6 +132,10 @@ protected override bool UpdateItems(ref Bounds viewBounds, ref Bounds contentBou
                 if (totalSize > 0)
                     changed = true;
             }
+            else if ((itemTypeEnd % contentConstraintCount != 0) && (itemTypeEnd < totalCount || totalCount < 0))
+            {
+                NewItemAtEnd();
+            }
 
             if (viewBounds.min.x < contentBounds.min.x + m_ContentLeftPadding)
             {

diff --git a/Runtime/LoopScrollRectBase.cs b/Runtime/LoopScrollRectBase.cs
@@ -888,7 +888,7 @@ public void RefreshCells()
                 // recycle items if we can
                 for (int i = 0; i < m_Content.childCount; i++)
                 {
-                    if (itemTypeEnd < totalCount)
+                    if (itemTypeEnd < totalCount || totalCount < 0)
                     {
                         ProvideData(m_Content.GetChild(i), itemTypeEnd);
                         itemTypeEnd++;

diff --git a/Runtime/LoopVerticalScrollRect.cs b/Runtime/LoopVerticalScrollRect.cs
@@ -131,6 +131,11 @@ protected override bool UpdateItems(ref Bounds viewBounds, ref Bounds contentBou
                 if (totalSize > 0)
                     changed = true;
             }
+            // issue #178: grid layout could increase totalCount at any time
+            else if ((itemTypeEnd % contentConstraintCount != 0) && (itemTypeEnd < totalCount || totalCount < 0))
+            {
+                NewItemAtEnd();
+            }
 
             if (viewBounds.max.y > contentBounds.max.y - m_ContentTopPadding)
             {

diff --git a/Runtime/LoopVerticalScrollRectMulti.cs b/Runtime/LoopVerticalScrollRectMulti.cs
@@ -131,6 +131,10 @@ protected override bool UpdateItems(ref Bounds viewBounds, ref Bounds contentBou
                 if (totalSize > 0)
                     changed = true;
             }
+            else if ((itemTypeEnd % contentConstraintCount != 0) && (itemTypeEnd < totalCount || totalCount < 0))
+            {
+                NewItemAtEnd();
+            }
 
             if (viewBounds.max.y > contentBounds.max.y - m_ContentTopPadding)
             {