1 files changed, 9 insertions, 28 deletions

diff --git a/src/body_layer.zig b/src/body_layer.zig
index db4d9524..2b6ae773 100644
--- a/src/body_layer.zig
+++ b/src/body_layer.zig
@@ -279,7 +279,7 @@ pub fn renderBodyLayer(p: *Pardes, arena: std.mem.Allocator, pane: *Pane, r: Rec
     @memset(temporary_cells, .{});
     var temporary: Surface = .{ .cols = r.w, .rows = @intCast(logical_rows + pane.tag_rows), .cells = temporary_cells };
     const synthetic: Rect = .{ .x = 0, .y = 0, .w = r.w, .h = @intCast(logical_rows + pane.tag_rows) };
-    try renderBody(p, &temporary, arena, pane, synthetic, id, id == p.active, false);
+    try renderBody(p, &temporary, arena, pane, synthetic, id, id == p.active, null);
     const first_row: usize = if (p.settings.tag_bottom) 0 else pane.tag_rows;
     for (0..logical_rows) |row| {
         const start = (row + first_row) * r.w + config.GUTTER;
@@ -287,7 +287,8 @@ pub fn renderBodyLayer(p: *Pardes, arena: std.mem.Allocator, pane: *Pane, r: Rec
     }
     layer.pane = @intCast(id);
     layer.serial = pane.serial;
-    layer.viewport = .{ .x = r.x + config.GUTTER, .y = p.bodyTop(pane, r), .w = width, .h = viewport_rows };
+    const body = p.surface.region(.body, id).?;
+    layer.viewport = .{ .x = body.rect.x, .y = body.rect.y, .w = body.rect.w - body.clip, .h = body.rect.h };
     layer.cols = width;
     layer.rows = @intCast(logical_rows);
     layer.context_rows = pane.context_rows;
@@ -299,7 +300,7 @@ pub fn renderBodyLayer(p: *Pardes, arena: std.mem.Allocator, pane: *Pane, r: Rec
     }
 }
 
-pub fn renderBody(p: *Pardes, s: *Surface, arena: std.mem.Allocator, pane: *Pane, r: Rect, id: usize, active: bool, scrollbar: bool) !void {
+pub fn renderBody(p: *Pardes, s: *Surface, arena: std.mem.Allocator, pane: *Pane, r: Rect, id: usize, active: bool, rail: ?pardes.Region) !void {
     const th = p.theme();
     const chrome = p.chromeTheme();
     const tx = r.x + config.GUTTER;
@@ -501,34 +502,14 @@ pub fn renderBody(p: *Pardes, s: *Surface, arena: std.mem.Allocator, pane: *Pane
         }
     }
 
-    if (scrollbar and body_h > 0) {
+    if (rail) |bar| if (bar.rect.h > 0) {
         // The rail covers the notice bands too: nothing else paints those
         // two gutter columns, so a gap there keeps the frame-wide border
         // fill and reads as a notch cut out of the scrollbar.
-        const rail_h = r.h -| pane.tag_rows;
-        s.fill(r.x, body_y, 1, rail_h, .{ .bg = .{ .rgb = chrome.scroll_track } });
-        s.fill(r.x + 1, body_y, 1, rail_h, .{ .bg = pane_bg });
-        const sb: struct { total: usize, offset: usize, len: usize } = if (pane.file) |*f| .{
-            .total = panes.File.nlines(p.gpa, f),
-            .offset = f.scroll,
-            .len = pane.rows,
-        } else if (pane.pdfPage()) |page| .{
-            .total = if (comptime pdf_enabled) pane.pdf.?.page_count else 1,
-            .offset = page,
-            .len = 1,
-        } else blk: {
-            const gsb = panes.Terminal.scrollbar(pane);
-            break :blk .{ .total = gsb.total, .offset = gsb.offset, .len = gsb.len };
-        };
-        const track_h: usize = body_h;
-        const total = if (sb.total == 0) 1 else sb.total;
-        const len = @max(1, (track_h * @max(1, sb.len)) / total);
-        const pos = (track_h * sb.offset) / total;
-        var sy: usize = pos;
-        while (sy < track_h and sy < pos + len) : (sy += 1) {
-            s.fill(r.x, body_y + @as(u16, @intCast(sy)), 1, 1, .{ .bg = .{ .rgb = chrome.scroll_thumb } });
-        }
-    }
+        s.fill(bar.rect.x, bar.rect.y, 1, bar.rect.h, .{ .bg = .{ .rgb = chrome.scroll_track } });
+        s.fill(bar.rect.x + 1, bar.rect.y, 1, bar.rect.h, .{ .bg = pane_bg });
+        s.fill(bar.rect.x, bar.rect.y + bar.thumb_y, 1, bar.thumb_h, .{ .bg = .{ .rgb = chrome.scroll_thumb } });
+    };
 }
 
 pub fn bodyText(p: *Pardes, arena: std.mem.Allocator, pane: *Pane) ![]const u8 {