From e593ffa264a4cd334cb3afd96a2de534e21d4b9d Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 10 Oct 2023 16:06:27 -0700 Subject: [PATCH] terminal: default for right scroll margin was incorrect --- src/terminal/Terminal.zig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/terminal/Terminal.zig b/src/terminal/Terminal.zig index f45884d04..75ca871a3 100644 --- a/src/terminal/Terminal.zig +++ b/src/terminal/Terminal.zig @@ -1827,7 +1827,7 @@ pub fn setLeftAndRightMargin(self: *Terminal, left_req: usize, right_req: usize) if (!self.modes.get(.enable_left_and_right_margin)) return; const left = @max(1, left_req); - const right = @min(self.rows, if (right_req == 0) self.rows else right_req); + const right = @min(self.cols, if (right_req == 0) self.cols else right_req); if (left >= right) return; self.scrolling_region.left = left - 1; @@ -2760,6 +2760,8 @@ test "Terminal: setLeftAndRightMargin left only" { try t.printString("GHI"); t.modes.set(.enable_left_and_right_margin, true); t.setLeftAndRightMargin(2, 0); + try testing.expectEqual(@as(usize, 1), t.scrolling_region.left); + try testing.expectEqual(@as(usize, t.cols - 1), t.scrolling_region.right); t.setCursorPos(1, 2); try t.insertLines(1);