zig/libvaxis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ScrollView: do scroll bounds checking early

Browse source 
The ScrollView will panic if scroll.y is given a number that is outside
the content size.
This commit is contained in:
Jari Vetoniemi 2024-06-08 17:21:55 +09:00 committed by Tim Culverhouse
parent 5a438e54f1
commit 9bbcebb7bc
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/widgets/ScrollView.zig
View file

@ -51,7 +51,10 @@ pub fn draw(self: *@This(), parent: vaxis.Window, content_size: struct {
cols: usize, cols: usize,
rows: usize, rows: usize,
}) void { }) void {
var content_cols = content_size.cols; const content_cols = if (self.vertical_scrollbar) |_| content_size.cols +| 1 else content_size.cols;
const max_scroll_x = content_cols -| parent.width;
const max_scroll_y = content_size.rows -| parent.height;
self.scroll.restrictTo(max_scroll_x, max_scroll_y);
if (self.vertical_scrollbar) |opts| { if (self.vertical_scrollbar) |opts| {
const vbar: vaxis.widgets.Scrollbar = .{ const vbar: vaxis.widgets.Scrollbar = .{
.character = opts.character, .character = opts.character,
@ -67,11 +70,7 @@ pub fn draw(self: *@This(), parent: vaxis.Window, content_size: struct {
}); });
bg.fill(.{ .char = opts.character, .style = opts.bg }); bg.fill(.{ .char = opts.character, .style = opts.bg });
vbar.draw(bg); vbar.draw(bg);
content_cols +|= 1;
} }
const max_scroll_x = content_cols -| parent.width;
const max_scroll_y = content_size.rows -| parent.height;
self.scroll.restrictTo(max_scroll_x, max_scroll_y);
} }
pub const BoundingBox = struct { pub const BoundingBox = struct {