Skip to content

Commit 75a825e

Browse files
authored
Fix ScrollArea::show_rows (#2258)
1 parent 3805a32 commit 75a825e

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

crates/egui/src/containers/scroll_area.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -499,9 +499,13 @@ impl ScrollArea {
499499
self.show_viewport(ui, |ui, viewport| {
500500
ui.set_height((row_height_with_spacing * total_rows as f32 - spacing.y).at_least(0.0));
501501

502-
let min_row = (viewport.min.y / row_height_with_spacing).floor() as usize;
503-
let max_row = (viewport.max.y / row_height_with_spacing).ceil() as usize + 1;
504-
let max_row = max_row.at_most(total_rows);
502+
let mut min_row = (viewport.min.y / row_height_with_spacing).floor() as usize;
503+
let mut max_row = (viewport.max.y / row_height_with_spacing).ceil() as usize + 1;
504+
if max_row > total_rows {
505+
let diff = max_row.saturating_sub(min_row);
506+
max_row = total_rows;
507+
min_row = total_rows.saturating_sub(diff);
508+
}
505509

506510
let y_min = ui.max_rect().top() + min_row as f32 * row_height_with_spacing;
507511
let y_max = ui.max_rect().top() + max_row as f32 * row_height_with_spacing;

0 commit comments

Comments
 (0)