From 9b1197feb3cb0aa8904180b950992d602d57ce41 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Mon, 27 Apr 2020 11:10:59 +0200 Subject: [PATCH] Fix application of exclusive zones Fixes https://github.com/ifreund/river/issues/13 --- src/output.zig | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/output.zig b/src/output.zig index 7933831..7ef053f 100644 --- a/src/output.zig +++ b/src/output.zig @@ -235,11 +235,14 @@ pub const Output = struct { } // Apply offsets from borders and padding - new_box.x += @intCast(i32, border_width + outer_padding + view_padding); - new_box.y += @intCast(i32, border_width + outer_padding + view_padding); + const xy_offset = @intCast(i32, border_width + outer_padding + view_padding); + new_box.x += self.usable_box.x + xy_offset; + new_box.y += self.usable_box.y + xy_offset; - new_box.width -= (border_width + view_padding) * 2; - new_box.height -= (border_width + view_padding) * 2; + // Reduce size to allow space for borders/padding + const delta_size = (border_width + view_padding) * 2; + new_box.width -= delta_size; + new_box.height -= delta_size; // Set the view's pending box to the new dimensions view.pending_box = new_box;