1
1
mirror of https://github.com/swaywm/sway synced 2024-11-19 03:24:39 +01:00

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

Stop floaters from snapping on move to new output
This commit is contained in:
Drew DeVault 2018-08-27 13:44:08 -04:00 committed by GitHub
commit 98ef29c228
Signed by: GitHub
GPG Key ID: 4AEE18F83AFDEB23

@ -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);
}
}
}