yves-biener/zterm
1
0
Fork 0
Code Issues Pull Requests Actions Wiki Activity

mod(container/layout): support gap configuration

Browse Source
This commit is contained in:
Yves Biener
2025-02-04 19:06:09 +01:00
parent 9c06ced658
commit 009d2129b6
2 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
examples/container.zig
View File

@@ -23,11 +23,19 @@ pub fn main() !void {
defer renderer.deinit(); defer renderer.deinit();
var container = try App.Container.init(allocator, .{ var container = try App.Container.init(allocator, .{
.border = .{ .color = .green, .corners = .rounded }, .border = .{
.color = .green,
.corners = .rounded,
.separator = .{ .enabled = true },
},
.layout = .{ .gap = 40 },
}); });
try container.append(try App.Container.init(allocator, .{ try container.append(try App.Container.init(allocator, .{
.border = .{ .color = .light_green, .corners = .squared }, .border = .{ .color = .light_green, .corners = .squared },
})); }));
try container.append(try App.Container.init(allocator, .{
.border = .{ .color = .light_red, .corners = .squared },
}));
defer container.deinit(); defer container.deinit();
// NOTE: should the min-size here be required? // NOTE: should the min-size here be required?

23
src/container.zig
View File

@@ -203,15 +203,27 @@ pub fn Container(comptime Event: type) type {
if (this.elements.items.len == 0) if (this.elements.items.len == 0)
break :resize; break :resize;
const sides = this.properties.border.sides;
const gap = this.properties.layout.gap;
const len: u16 = @truncate(this.elements.items.len); const len: u16 = @truncate(this.elements.items.len);
const element_cols = @divTrunc(size.cols, len); const element_cols = blk: {
const element_rows = @divTrunc(size.rows, len); var cols = size.cols - gap * (len - 1);
if (sides.left) cols -= 1;
if (sides.right) cols -= 1;
break :blk @divTrunc(cols, len);
};
const element_rows = blk: {
var rows = size.rows - gap * (len - 1);
if (sides.top) rows -= 1;
if (sides.bottom) rows -= 1;
break :blk @divTrunc(rows, len);
};
var offset: u16 = 0; var offset: u16 = 0;
for (this.elements.items) |*element| { for (this.elements.items) |*element| {
var element_size: Size = undefined; var element_size: Size = undefined;
switch (this.properties.layout.direction) { switch (this.properties.layout.direction) {
.horizontal => { .horizontal => {
var overflow = size.cols % len; var overflow = size.cols - element_cols * len;
// adjust size according to the containing elements // adjust size according to the containing elements
var cols = element_cols; var cols = element_cols;
if (overflow > 0) { if (overflow > 0) {
@@ -227,9 +239,10 @@ pub fn Container(comptime Event: type) type {
.rows = size.rows, .rows = size.rows,
}; };
offset += cols; offset += cols;
offset += gap;
}, },
.vertical => { .vertical => {
var overflow = size.rows % len; var overflow = size.rows - element_rows * len;
// adjust size according to the containing elements // adjust size according to the containing elements
var rows = element_rows; var rows = element_rows;
if (overflow > 0) { if (overflow > 0) {
@@ -245,11 +258,11 @@ pub fn Container(comptime Event: type) type {
.rows = rows, .rows = rows,
}; };
offset += rows; offset += rows;
offset += gap;
}, },
} }
// border resizing // border resizing
const sides = this.properties.border.sides;
if (sides.top) { if (sides.top) {
element_size.anchor.row += 1; element_size.anchor.row += 1;
element_size.rows -|= 1; element_size.rows -|= 1;