mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-24 08:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix moving a container to an empty workspace

Browse source 
When a container with children is moved to a different workspace its
layout should not change, but currently if the destination workspace is
empty, each child of the container gets "split" (wrapped in a tabbing
/ stacking container) if the `workspace_layout` option is not default.
This commit is contained in:
Baltazár Radics 2022-07-31 23:58:04 +02:00
parent ebf441b359
commit bf30257c1e
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/sway/tree/workspace.h
View file

@ -113,6 +113,9 @@ void workspace_detach(struct sway_workspace *workspace);
struct sway_container *workspace_add_tiling(struct sway_workspace *workspace, struct sway_container *workspace_add_tiling(struct sway_workspace *workspace,
struct sway_container *con); struct sway_container *con);
void workspace_attach_tiling(struct sway_workspace *ws,
struct sway_container *con);
void workspace_add_floating(struct sway_workspace *workspace, void workspace_add_floating(struct sway_workspace *workspace,
struct sway_container *con); struct sway_container *con);

2
sway/commands/move.c
View file

@ -213,7 +213,7 @@ static void container_move_to_workspace(struct sway_container *container,
} else { } else {
container_detach(container); container_detach(container);
if (workspace_is_empty(workspace) && container->pending.children) { if (workspace_is_empty(workspace) && container->pending.children) {
workspace_unwrap_children(workspace, container); workspace_attach_tiling(workspace, container);
} else { } else {
container->pending.width = container->pending.height = 0; container->pending.width = container->pending.height = 0;
container->width_fraction = container->height_fraction = 0; container->width_fraction = container->height_fraction = 0;

2
sway/tree/workspace.c
View file

@ -734,7 +734,7 @@ static void set_workspace(struct sway_container *container, void *data) {
container->pending.workspace = container->pending.parent->pending.workspace; container->pending.workspace = container->pending.parent->pending.workspace;
} }
static void workspace_attach_tiling(struct sway_workspace *ws, void workspace_attach_tiling(struct sway_workspace *ws,
struct sway_container *con) { struct sway_container *con) {
list_add(ws->tiling, con); list_add(ws->tiling, con);
con->pending.workspace = ws; con->pending.workspace = ws;