diff options
| author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-09-23 11:36:16 +1000 |
|---|---|---|
| committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-09-23 11:36:16 +1000 |
| commit | 64445f421452b841eb124f7f89e06084b05b1a54 (patch) | |
| tree | 46b3bd642ce0e09a2a048fe85224494daec1a80c /sway | |
| parent | 68395f34f686aa1901077505405775ba5bafe6ee (diff) | |
Prevent sticky containers from jumping on workspace switch
If you have swaybar docked to the top, and you create a floating sticky
container and switch workspaces on the same output, the sticky container
would move down by the height of swaybar on each switch.
This happens because when creating the workspace we set the dimensions
to the same as the output, then the subsequent arrange corrects it.
During this arrange, floating containers are translated so they stay
relative to the workspace. This translation needs to not occur for the
initial arrange.
This patch makes workspaces have a zero width and height when first
created, so we can detect whether this is the initial arrange and avoid
translating the floating containers if so.
Diffstat (limited to 'sway')
| -rw-r--r-- | sway/tree/arrange.c | 3 | ||||
| -rw-r--r-- | sway/tree/workspace.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/sway/tree/arrange.c b/sway/tree/arrange.c index d50be25d..373460a2 100644 --- a/sway/tree/arrange.c +++ b/sway/tree/arrange.c @@ -186,6 +186,7 @@ void arrange_workspace(struct sway_workspace *workspace) { area->width, area->height, area->x, area->y); workspace_remove_gaps(workspace); + bool first_arrange = workspace->width == 0 && workspace->height == 0; double prev_x = workspace->x; double prev_y = workspace->y; workspace->width = area->width; @@ -196,7 +197,7 @@ void arrange_workspace(struct sway_workspace *workspace) { // Adjust any floating containers double diff_x = workspace->x - prev_x; double diff_y = workspace->y - prev_y; - if (diff_x != 0 || diff_y != 0) { + if (!first_arrange && (diff_x != 0 || diff_y != 0)) { for (int i = 0; i < workspace->floating->length; ++i) { struct sway_container *floater = workspace->floating->items[i]; container_floating_translate(floater, diff_x, diff_y); diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c index b0c440c1..16031e87 100644 --- a/sway/tree/workspace.c +++ b/sway/tree/workspace.c @@ -54,10 +54,6 @@ struct sway_workspace *workspace_create(struct sway_output *output, return NULL; } node_init(&ws->node, N_WORKSPACE, ws); - ws->x = output->lx; - ws->y = output->ly; - ws->width = output->width; - ws->height = output->height; ws->name = name ? strdup(name) : NULL; ws->prev_split_layout = L_NONE; ws->layout = output_get_default_layout(output); |