mirror of
https://github.com/swaywm/sway.git
synced 2024-12-30 17:06:40 +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:
commit
98ef29c228
1 changed files with 12 additions and 10 deletions
|
@ -216,16 +216,18 @@ static void arrange_workspace(struct sway_container *workspace) {
|
||||||
// Adjust any floating containers
|
// Adjust any floating containers
|
||||||
double diff_x = workspace->x - prev_x;
|
double diff_x = workspace->x - prev_x;
|
||||||
double diff_y = workspace->y - prev_y;
|
double diff_y = workspace->y - prev_y;
|
||||||
for (int i = 0; i < workspace->sway_workspace->floating->length; ++i) {
|
if (diff_x != 0 || diff_y != 0) {
|
||||||
struct sway_container *floater =
|
for (int i = 0; i < workspace->sway_workspace->floating->length; ++i) {
|
||||||
workspace->sway_workspace->floating->items[i];
|
struct sway_container *floater =
|
||||||
container_floating_translate(floater, diff_x, diff_y);
|
workspace->sway_workspace->floating->items[i];
|
||||||
double center_x = floater->x + floater->width / 2;
|
container_floating_translate(floater, diff_x, diff_y);
|
||||||
double center_y = floater->y + floater->height / 2;
|
double center_x = floater->x + floater->width / 2;
|
||||||
struct wlr_box workspace_box;
|
double center_y = floater->y + floater->height / 2;
|
||||||
container_get_box(workspace, &workspace_box);
|
struct wlr_box workspace_box;
|
||||||
if (!wlr_box_contains_point(&workspace_box, center_x, center_y)) {
|
container_get_box(workspace, &workspace_box);
|
||||||
container_floating_move_to_center(floater);
|
if (!wlr_box_contains_point(&workspace_box, center_x, center_y)) {
|
||||||
|
container_floating_move_to_center(floater);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue