From 17c9a0e84f066f6ad1e7d93be0edf8e7bf3a59b7 Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Fri, 26 Jul 2019 01:31:18 -0400 Subject: arrange: remove gaps for workspace location deltas When arranging the workspace, prev_x and prev_y should be ignoring the current gaps otherwise the workspace diff_x and diff_y location deltas will be off. When the deltas are off, each arrangement of the workspace would incorrectly move floaters an extra -workspace->current_gaps.left along the x-axis and an extra -workspace->current_gaps.top along the y-axis. --- sway/tree/arrange.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sway/tree/arrange.c b/sway/tree/arrange.c index 696d0e1f..7b88b3a2 100644 --- a/sway/tree/arrange.c +++ b/sway/tree/arrange.c @@ -262,8 +262,8 @@ void arrange_workspace(struct sway_workspace *workspace) { area->width, area->height, area->x, area->y); bool first_arrange = workspace->width == 0 && workspace->height == 0; - double prev_x = workspace->x; - double prev_y = workspace->y; + double prev_x = workspace->x - workspace->current_gaps.left; + double prev_y = workspace->y - workspace->current_gaps.top; workspace->width = area->width; workspace->height = area->height; workspace->x = output->lx + area->x; -- cgit v1.2.3-54-g00ecf