diff options
Diffstat (limited to 'src/pardes.zig')
| -rw-r--r-- | src/pardes.zig | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/pardes.zig b/src/pardes.zig index 940e5c5d..35cccf26 100644 --- a/src/pardes.zig +++ b/src/pardes.zig @@ -158,14 +158,15 @@ pub const BOX_H: u16 = 1; pub const TAG_TEXT_INSET: u16 = config.GUTTER; pub fn taglineOriginCol(p: *const Pardes, col: u16, row: u16) f32 { + const v = p.view(); if (row < p.topBarHeight()) return 0; if (row < p.topBarHeight() + layout.columnBarHeight(p)) { - for (p.col_x[0..p.ncol], p.col_w[0..p.ncol]) |x, w| + for (v.col_x[0..p.view().ncol], v.col_w[0..p.view().ncol]) |x, w| if (col >= x and col - x < w) return @floatFromInt(x); } for (p.panes, 0..) |slot, id| { const pane = slot orelse continue; - const r = p.rects[id]; + const r = v.rects[id]; const tag_y = p.tagTop(pane, r); if (row >= tag_y and row < tag_y + pane.tag_rows and col >= r.x and col < r.x + r.w) return @floatFromInt(r.x); } @@ -177,7 +178,7 @@ pub fn gridColAt(p: ?*const Pardes, x: f32, row: u16, body_w: f32, tagline_w: f3 const tag = @max(tagline_w, 1); if (row < (if (p) |core| core.topBarHeight() else TOPBAR_H)) return colFromSpan(x, tag); if (p) |core| if (row < core.topBarHeight() + layout.columnBarHeight(core)) { - for (core.col_x[0..core.ncol], core.col_w[0..core.ncol]) |origin, width| { + for (core.view().col_x[0..core.view().ncol], core.view().col_w[0..core.view().ncol]) |origin, width| { if (width == 0) continue; const left = @as(f32, @floatFromInt(origin)) * body; const right = @as(f32, @floatFromInt(origin + width)) * body; @@ -190,7 +191,7 @@ pub fn gridColAt(p: ?*const Pardes, x: f32, row: u16, body_w: f32, tagline_w: f3 }; if (p) |core| for (core.panes, 0..) |slot, id| { const pane = slot orelse continue; - const r = core.rects[id]; + const r = core.view().rects[id]; const tag_y = core.tagTop(pane, r); if (row < tag_y or row >= tag_y + pane.tag_rows or r.w == 0) continue; const left = @as(f32, @floatFromInt(r.x)) * body; @@ -218,8 +219,8 @@ test "a compact tagline anchors at its own pane, and both shells step from the s // Two panes side by side put two tags on ONE row, which is the case a // per-row origin gets wrong and the reason this is asked per cell. - const left = p.rects[0]; - const right = p.rects[1]; + const left = p.view().rects[0]; + const right = p.view().rects[1]; try std.testing.expect(right.x > left.x); try std.testing.expectEqual(@as(f32, @floatFromInt(left.x)), taglineOriginCol(p, left.x + 3, left.y)); try std.testing.expectEqual(@as(f32, @floatFromInt(right.x)), taglineOriginCol(p, right.x + 3, right.y)); @@ -233,7 +234,7 @@ test "a compact tagline anchors at its own pane, and both shells step from the s const body_w: f32 = 10; const tag_w: f32 = 8; - for (p.col_x[0..p.ncol], p.col_w[0..p.ncol]) |origin, width| { + for (p.view().col_x[0..p.view().ncol], p.view().col_w[0..p.view().ncol]) |origin, width| { if (width == 0) continue; const col = origin; try std.testing.expectEqual(@as(f32, @floatFromInt(origin)), taglineOriginCol(p, col, TOPBAR_H)); |
