alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix some bugs as a result of removing move_out_of_tabs_stacks

Browse source
This commit is contained in:
Ryan Dwyer 2018-09-23 13:55:06 +10:00
parent 93624599b3
commit 0b7fb6943e
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sway/commands/move.c
View file

@ -259,6 +259,12 @@ static void container_move_to_container(struct sway_container *container,
* In other words, rejigger it. */ * In other words, rejigger it. */
static void workspace_rejigger(struct sway_workspace *ws, static void workspace_rejigger(struct sway_workspace *ws,
struct sway_container *child, enum movement_direction move_dir) { struct sway_container *child, enum movement_direction move_dir) {
if (!child->parent && ws->tiling->length == 1) {
ws->layout =
move_dir == MOVE_LEFT || move_dir == MOVE_RIGHT ? L_HORIZ : L_VERT;
workspace_update_representation(ws);
return;
}
container_detach(child); container_detach(child);
workspace_wrap_children(ws); workspace_wrap_children(ws);
@ -343,10 +349,8 @@ static bool container_move_in_direction(struct sway_container *container,
// Maybe rejigger the workspace // Maybe rejigger the workspace
struct sway_workspace *ws = container->workspace; struct sway_workspace *ws = container->workspace;
if (!is_parallel(ws->layout, move_dir)) { if (!is_parallel(ws->layout, move_dir)) {
if (ws->tiling->length >= 2) { workspace_rejigger(ws, container, move_dir);
workspace_rejigger(ws, container, move_dir); return true;
return true;
}
} else if (ws->layout == L_TABBED || ws->layout == L_STACKED) { } else if (ws->layout == L_TABBED || ws->layout == L_STACKED) {
workspace_rejigger(ws, container, move_dir); workspace_rejigger(ws, container, move_dir);
return true; return true;