Data Browser: correctly count the number of visible rows

mgrojo · mgrojo · commit cb33e94f4257 · 2023-09-30T00:38:03.000+02:00
- Start counting by 1, so rowCount() matches the row_bottom. - Use viewport, so we don't have to adjust for the scrollbar. - Discard from the count rows partially visible (more than a half hidden) - Do not update the recordset label in refresh, since it returns a bad number and seems unnecessary. See issues #3180 and #3176.
diff --git a/src/ExtendedTableWidget.cpp b/src/ExtendedTableWidget.cpp
@@ -1033,13 +1033,13 @@ int ExtendedTableWidget::numVisibleRows() const
         return 0;
 
     // Get the row numbers of the rows currently visible at the top and the bottom of the widget
-    int row_top = rowAt(0) == -1 ? 0 : rowAt(0);
-    int row_bottom = verticalHeader()->visualIndexAt(height()) == -1 ? model()->rowCount() : (verticalHeader()->visualIndexAt(height()) - 1);
-    if(horizontalScrollBar()->isVisible())      // Assume the scrollbar covers about one row
-        row_bottom--;
+    int row_top = rowAt(0) == -1 ? 0 : verticalHeader()->visualIndexAt(0) + 1;
+    // Adjust the height so we don't count rows visible only less than a half of the default height
+    int adjusted_height = viewport()->height() - (verticalHeader()->defaultSectionSize() / 2);
+    int row_bottom = verticalHeader()->visualIndexAt(adjusted_height) == -1 ? model()->rowCount() : (verticalHeader()->visualIndexAt(adjusted_height) + 1);
 
     // Calculate the number of visible rows
-    return row_bottom - row_top;
+    return row_bottom - row_top + 1;
 }
 
 std::unordered_set<size_t> ExtendedTableWidget::selectedCols() const
diff --git a/src/TableBrowser.cpp b/src/TableBrowser.cpp
@@ -553,7 +553,6 @@ void TableBrowser::refresh()
     // Build query and apply settings
    applyModelSettings(storedData, buildQuery(storedData, tablename));
    applyViewportSettings(storedData, tablename);
-   updateRecordsetLabel();
    emit updatePlot(ui->dataTable, m_model, &m_settings[tablename], true);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -553,7 +553,6 @@ void TableBrowser::refresh()`
`553`	`553`	`// Build query and apply settings`
`554`	`554`	`applyModelSettings(storedData, buildQuery(storedData, tablename));`
`555`	`555`	`applyViewportSettings(storedData, tablename);`
`556`		`- updateRecordsetLabel();`
`557`	`556`	`emit updatePlot(ui->dataTable, m_model, &m_settings[tablename], true);`
`558`	`557`	`}`
`559`	`558`