Fix [a9e637f1c8]: ttk::treeview does not show partial bottom row

tcltk · Jan 5, 2024 · d125895 · d125895
2 parents ea8d732 + 89d9617
commit d125895
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/generic/ttk/ttkTreeview.c b/generic/ttk/ttkTreeview.c
@@ -1617,7 +1617,7 @@ static Ttk_Layout TreeviewGetLayout(
 static void TreeviewDoLayout(void *clientData)
 {
     Treeview *tv = clientData;
-    int visibleRows;
+    int totalRows, visibleRows;
 
     Ttk_PlaceLayout(tv->core.layout,tv->core.state,Ttk_WinBox(tv->core.tkwin));
     tv->tree.treeArea = Ttk_ClientRegion(tv->core.layout, "treearea");
@@ -1636,12 +1636,22 @@ static void TreeviewDoLayout(void *clientData)
 	tv->tree.headingArea = Ttk_MakeBox(0,0,0,0);
     }
 
-    visibleRows = tv->tree.treeArea.height / tv->tree.rowHeight;
     tv->tree.root->state |= TTK_STATE_OPEN;
+    totalRows = CountRows(tv->tree.root) - 1;
+    visibleRows = tv->tree.treeArea.height / tv->tree.rowHeight;
+    if (tv->tree.treeArea.height % tv->tree.rowHeight) {
+        /* When the treeview height doesn't correspond to an exact number
+         * of rows, the visible row count must be incremented to draw a
+         * partial row at the bottom. The total row count must also be
+         * incremented to be able to scroll all the way to the bottom.
+         */
+        visibleRows++;
+        totalRows++;
+    }
     TtkScrolled(tv->tree.yscrollHandle,
 	    tv->tree.yscroll.first,
 	    tv->tree.yscroll.first + visibleRows,
-	    CountRows(tv->tree.root) - 1);
+	    totalRows);
 }
 
 /* + TreeviewSize --