Merge pull request #4911 from dweymouth/list-fix-lastrow-missing

Fix last row sometimes being missing in List
fyne-io · Jun 22, 2024 · 0e478c3 · 0e478c3
2 parents c3215ee + bfbee04
commit 0e478c3
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 9 deletions.
diff --git a/widget/list.go b/widget/list.go
@@ -411,11 +411,11 @@ func (l *listLayout) calculateVisibleRowHeights(itemHeight float32, length int)
 			offY = 0
 		}
 
-		if maxRow > length {
-			maxRow = length
+		if maxRow > length-1 {
+			maxRow = length - 1
 		}
 
-		for i := 0; i < maxRow-minRow; i++ {
+		for i := 0; i <= maxRow-minRow; i++ {
 			l.visibleRowHeights = append(l.visibleRowHeights, itemHeight)
 		}
 		return

diff --git a/widget/list_test.go b/widget/list_test.go
@@ -490,7 +490,7 @@ func TestList_ScrollThenShrink(t *testing.T) {
 
 	visibles := list.scroller.Content.(*fyne.Container).Layout.(*listLayout).children
 	visibleCount := len(visibles)
-	assert.Equal(t, visibleCount, 8)
+	assert.Equal(t, visibleCount, 9)
 
 	list.scroller.ScrollToBottom()
 	visibles = list.scroller.Content.(*fyne.Container).Layout.(*listLayout).children
@@ -637,11 +637,11 @@ func TestList_LimitUpdateItem(t *testing.T) {
 	)
 	w.SetContent(list)
 	w.ShowAndRun()
-	assert.Equal(t, "0.0.", printOut)
+	assert.Equal(t, "0.1.0.1.", printOut)
 	list.scrollTo(1)
-	assert.Equal(t, "0.0.1.", printOut)
+	assert.Equal(t, "0.1.0.1.2.", printOut)
 	list.scrollTo(2)
-	assert.Equal(t, "0.0.1.2.", printOut)
+	assert.Equal(t, "0.1.0.1.2.3.", printOut)
 }
 
 func TestList_RefreshUpdatesAllItems(t *testing.T) {

diff --git a/widget/testdata/list/initial.xml b/widget/testdata/list/initial.xml
@@ -135,6 +135,18 @@
 							</widget>
 						</container>
 					</widget>
+					<widget pos="0,429" size="192x35" type="*widget.listItem">
+						<container size="192x35">
+							<widget size="20x35" type="*widget.Icon">
+								<image fillMode="contain" rsc="documentIcon" size="20x35" themed="foreground"/>
+							</widget>
+							<widget pos="24,0" size="168x35" type="*widget.Label">
+								<widget size="168x35" type="*widget.RichText">
+									<text pos="8,8" size="80x19">Test Item 11</text>
+								</widget>
+							</widget>
+						</container>
+					</widget>
 					<widget size="0x0" type="*widget.Separator">
 						<rectangle fillColor="separator" size="0x0"/>
 					</widget>
@@ -168,6 +180,9 @@
 					<widget pos="0,388" size="192x1" type="*widget.Separator">
 						<rectangle fillColor="separator" size="192x1"/>
 					</widget>
+					<widget pos="0,427" size="192x1" type="*widget.Separator">
+						<rectangle fillColor="separator" size="192x1"/>
+					</widget>
 				</container>
 				<widget pos="0,392" size="192x0" type="*widget.Shadow">
 					<linearGradient endColor="shadow" pos="0,-8" size="192x8"/>

diff --git a/widget/testdata/list/item_removed.xml b/widget/testdata/list/item_removed.xml
@@ -20,8 +20,8 @@
 							<widget size="20x35" type="*widget.Icon">
 								<image fillMode="contain" rsc="documentIcon" size="20x35" themed="foreground"/>
 							</widget>
-							<widget pos="24,0" size="123x35" type="*widget.Label">
-								<widget size="123x35" type="*widget.RichText">
+							<widget pos="24,0" size="88x35" type="*widget.Label">
+								<widget size="88x35" type="*widget.RichText">
 									<text pos="8,8" size="72x19">Test Item 1</text>
 								</widget>
 							</widget>

diff --git a/widget/testdata/list/new_data.xml b/widget/testdata/list/new_data.xml
@@ -135,6 +135,18 @@
 							</widget>
 						</container>
 					</widget>
+					<widget pos="0,429" size="192x35" type="*widget.listItem">
+						<container size="192x35">
+							<widget size="20x35" type="*widget.Icon">
+								<image fillMode="contain" rsc="documentIcon" size="20x35" themed="foreground"/>
+							</widget>
+							<widget pos="24,0" size="168x35" type="*widget.Label">
+								<widget size="168x35" type="*widget.RichText">
+									<text pos="8,8" size="3x19">l</text>
+								</widget>
+							</widget>
+						</container>
+					</widget>
 					<widget size="0x0" type="*widget.Separator">
 						<rectangle fillColor="separator" size="0x0"/>
 					</widget>
@@ -168,6 +180,9 @@
 					<widget pos="0,388" size="192x1" type="*widget.Separator">
 						<rectangle fillColor="separator" size="192x1"/>
 					</widget>
+					<widget pos="0,427" size="192x1" type="*widget.Separator">
+						<rectangle fillColor="separator" size="192x1"/>
+					</widget>
 				</container>
 				<widget pos="0,392" size="192x0" type="*widget.Shadow">
 					<linearGradient endColor="shadow" pos="0,-8" size="192x8"/>

diff --git a/widget/testdata/list/offset_changed.xml b/widget/testdata/list/offset_changed.xml
@@ -135,6 +135,18 @@
 							</widget>
 						</container>
 					</widget>
+					<widget pos="0,703" size="192x35" type="*widget.listItem">
+						<container size="192x35">
+							<widget size="20x35" type="*widget.Icon">
+								<image fillMode="contain" rsc="documentIcon" size="20x35" themed="foreground"/>
+							</widget>
+							<widget pos="24,0" size="168x35" type="*widget.Label">
+								<widget size="168x35" type="*widget.RichText">
+									<text pos="8,8" size="80x19">Test Item 18</text>
+								</widget>
+							</widget>
+						</container>
+					</widget>
 					<widget size="0x0" type="*widget.Separator">
 						<rectangle fillColor="separator" size="0x0"/>
 					</widget>
@@ -168,6 +180,9 @@
 					<widget pos="0,661" size="192x1" type="*widget.Separator">
 						<rectangle fillColor="separator" size="192x1"/>
 					</widget>
+					<widget pos="0,700" size="192x1" type="*widget.Separator">
+						<rectangle fillColor="separator" size="192x1"/>
+					</widget>
 				</container>
 				<widget size="192x0" type="*widget.Shadow">
 					<linearGradient size="192x8" startColor="shadow"/>

diff --git a/widget/testdata/list/resized.xml b/widget/testdata/list/resized.xml
@@ -195,6 +195,18 @@
 							</widget>
 						</container>
 					</widget>
+					<widget pos="0,625" size="192x35" type="*widget.listItem">
+						<container size="192x35">
+							<widget size="20x35" type="*widget.Icon">
+								<image fillMode="contain" rsc="documentIcon" size="20x35" themed="foreground"/>
+							</widget>
+							<widget pos="24,0" size="168x35" type="*widget.Label">
+								<widget size="168x35" type="*widget.RichText">
+									<text pos="8,8" size="80x19">Test Item 16</text>
+								</widget>
+							</widget>
+						</container>
+					</widget>
 					<widget size="0x0" type="*widget.Separator">
 						<rectangle fillColor="separator" size="0x0"/>
 					</widget>
@@ -243,6 +255,9 @@
 					<widget pos="0,583" size="192x1" type="*widget.Separator">
 						<rectangle fillColor="separator" size="192x1"/>
 					</widget>
+					<widget pos="0,622" size="192x1" type="*widget.Separator">
+						<rectangle fillColor="separator" size="192x1"/>
+					</widget>
 				</container>
 				<widget pos="0,592" size="192x0" type="*widget.Shadow">
 					<linearGradient endColor="shadow" pos="0,-8" size="192x8"/>