diff options
Diffstat (limited to 'src/tagline.zig')
| -rw-r--r-- | src/tagline.zig | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/tagline.zig b/src/tagline.zig index e14feab4..0bb0018b 100644 --- a/src/tagline.zig +++ b/src/tagline.zig @@ -11,6 +11,7 @@ const exec = @import("exec.zig"); const config = @import("config.zig"); const pdf_enabled = panes.Pdf.enabled; const Layer = @import("Layer.zig"); +const layout = @import("layout.zig"); const Pane = panes.Pane; const Text = panes.Text; const TAG_TEXT_INSET = pardes.TAG_TEXT_INSET; @@ -82,11 +83,11 @@ pub fn revealHeader(p: *Pardes) void { }; const text = edit.flatSurface(p, t) catch return; const cur: usize = @intCast(@max(0, t.cur_row)); - const rows: usize = if (p.header_column != null) p.columnBarHeight() else p.topBarHeight(); + const rows: usize = if (p.header_column != null) layout.columnBarHeight(p) else p.topBarHeight(); if (cur < p.header_top) p.header_top = cur; if (rows > 0 and cur >= p.header_top + rows) p.header_top = cur + 1 - rows; const line = modal.lineSlice(text, cur); - const width = p.tagCapacity(if (p.header_column) |c| p.col_w[c] -| TAG_TEXT_INSET else p.screen_w -| TAG_TEXT_INSET); + const width = layout.tagCapacity(p, if (p.header_column) |c| p.col_w[c] -| TAG_TEXT_INSET else p.screen_w -| TAG_TEXT_INSET); const col = panes.File.rawDisplayCol(line, @min(@as(usize, @intCast(@max(0, t.cur_col))), line.len)); if (col < p.header_scroll) p.header_scroll = col; if (col >= p.header_scroll + width) p.header_scroll = col -| (width -| 1); @@ -308,7 +309,7 @@ pub fn wrapTag(arena: std.mem.Allocator, whole: []const u8, width: usize) !Shown /// than what is left (libframe frutil.c _frcklinewrap), and the caret past /// its end sits at the edge (frptofchar.c clamps it to r.max.x). pub fn tagWidth(p: *const Pardes, id: usize) usize { - return @max(1, @as(usize, p.tagCapacity(p.rects[id].w -| TAG_TEXT_INSET))); + return @max(1, @as(usize, layout.tagCapacity(p, p.rects[id].w -| TAG_TEXT_INSET))); } pub fn shownTag(p: *Pardes, arena: std.mem.Allocator, pane: *Pane) !Shown { @@ -504,7 +505,7 @@ test "a column or workspace tag is one line: a newline in it is a space" { try std.testing.expectEqualStrings("Newcol Exit", p.global_tag.own.?); try std.testing.expectEqual(@as(i32, 0), p.col_tags[0].cur_row); try std.testing.expectEqual(@as(i32, 6), p.col_tags[0].cur_col); - try std.testing.expectEqual(pardes.COLBAR_H, p.columnBarHeight()); + try std.testing.expectEqual(pardes.COLBAR_H, layout.columnBarHeight(p)); try std.testing.expectEqual(pardes.TOPBAR_H, p.topBarHeight()); } |
