From 11c1619f300f076adaa55aa54f996a59f8dada67 Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Mon, 27 Aug 2018 03:06:37 -0400 Subject: [PATCH] Stop floaters from snapping on move to new output --- sway/tree/arrange.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/sway/tree/arrange.c b/sway/tree/arrange.c index 60e5b951e..8d67116ae 100644 --- a/sway/tree/arrange.c +++ b/sway/tree/arrange.c @@ -216,16 +216,18 @@ static void arrange_workspace(struct sway_container *workspace) { // Adjust any floating containers double diff_x = workspace->x - prev_x; double diff_y = workspace->y - prev_y; - for (int i = 0; i < workspace->sway_workspace->floating->length; ++i) { - struct sway_container *floater = - workspace->sway_workspace->floating->items[i]; - container_floating_translate(floater, diff_x, diff_y); - double center_x = floater->x + floater->width / 2; - double center_y = floater->y + floater->height / 2; - struct wlr_box workspace_box; - container_get_box(workspace, &workspace_box); - if (!wlr_box_contains_point(&workspace_box, center_x, center_y)) { - container_floating_move_to_center(floater); + if (diff_x != 0 || diff_y != 0) { + for (int i = 0; i < workspace->sway_workspace->floating->length; ++i) { + struct sway_container *floater = + workspace->sway_workspace->floating->items[i]; + container_floating_translate(floater, diff_x, diff_y); + double center_x = floater->x + floater->width / 2; + double center_y = floater->y + floater->height / 2; + struct wlr_box workspace_box; + container_get_box(workspace, &workspace_box); + if (!wlr_box_contains_point(&workspace_box, center_x, center_y)) { + container_floating_move_to_center(floater); + } } }