Merge pull request #2523 from RedSoxFan/fix-floating-drag-outputs

Stop floaters from snapping on move to new output
swaywm · Aug 27, 2018 · 98ef29c · 98ef29c
2 parents 82423b8 + 11c1619
commit 98ef29c
Showing 1 changed file with 12 additions and 10 deletions.
diff --git 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);
+			}
 		}
 	}