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

view: continued initial implementation

Browse source 
- Added proper bounds checking to fit the View within the provided Window.
- Added a simple x/y return Type to the `toWin()` function so users can more easily maintain scrolling bounds.
This commit is contained in:
00JCIV00 2024-09-23 22:00:30 -04:00 • committed by Tim Culverhouse
parent 94bec1ec2a
commit a7fcbe2d73
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/View.zig
View file

@ -57,7 +57,7 @@ pub fn deinit(self: *View) void {
self.alloc.destroy(self.screen); self.alloc.destroy(self.screen);
} }
///Render Config f/ `toWin()` /// Render Config f/ `toWin()`
pub const RenderConfig = struct { pub const RenderConfig = struct {
x: usize = 0, x: usize = 0,
y: usize = 0, y: usize = 0,
@ -70,35 +70,37 @@ pub const RenderConfig = struct {
}; };
}; };
/// Render a portion of this View to the provided Window (`win`). /// Render a portion of this View to the provided Window (`win`).
pub fn toWin(self: *View, win: *const Window, config: RenderConfig) !void { /// This will return the bounded X (col), Y (row) coordinates based on the rendering.
//if (config.x >= self.screen.width or config.y >= self.screen.height) pub fn toWin(self: *View, win: *const Window, config: RenderConfig) !struct{ usize, usize } {
// return error.PositionOutOfBounds; var x = @min(self.screen.width - 1, config.x);
const x = @min(self.screen.width - 1, config.x); var y = @min(self.screen.height - 1, config.y);
const y = @min(self.screen.height - 1, config.y);
const width = width: { const width = width: {
const width = switch (config.width) { var width = switch (config.width) {
.fit => win.width, .fit => win.width,
.max => |w| @min(win.width, w), .max => |w| @min(win.width, w),
}; };
break :width @min(width, self.screen.width -| x); width = @min(width, self.screen.width);
break :width @min(width, self.screen.width -| 1 -| x +| win.width);
}; };
const height = height: { const height = height: {
const height = switch (config.height) { var height = switch (config.height) {
.fit => win.height, .fit => win.height,
.max => |h| @min(win.height, h), .max => |h| @min(win.height, h),
}; };
break :height @min(height, self.screen.height -| y); height = @min(height, self.screen.height);
break :height @min(height, self.screen.height -| 1 -| y +| win.height);
}; };
//win.clear(); x = @min(x, self.screen.width -| width);
y = @min(y, self.screen.height -| height);
for (0..height) |row| { for (0..height) |row| {
for (0..width) |col| { for (0..width) |col| {
win.writeCell( win.writeCell(
col, col,
row, row,
self.win.readCell( self.win.readCell(
@min(self.screen.width, x +| col), @min(self.screen.width -| 1, x +| col),
//self.screen.height -| 1 -| @min(self.screen.height, y +| row), @min(self.screen.height -| 1, y +| row),
@min(self.screen.height, y +| row),
) orelse { ) orelse {
std.log.err( std.log.err(
\\ Position Out of Bounds: \\ Position Out of Bounds:
@ -114,6 +116,7 @@ pub fn toWin(self: *View, win: *const Window, config: RenderConfig) !void {
); );
} }
} }
return .{ x, y };
} }
/// Writes a cell to the location in the View /// Writes a cell to the location in the View