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

Merge pull request #2079 from RedSoxFan/fix-2078

Browse source 
Fix moving out of tab/stack when only child
This commit is contained in:
Drew DeVault 2018-05-31 22:11:12 -04:00 committed by GitHub
parent 536773e3a1 e13c94f2dd
commit 4495ec64b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sway/tree/layout.c
View file

@ -312,6 +312,19 @@ static void workspace_rejigger(struct sway_container *ws,
static void move_out_of_tabs_stacks(struct sway_container *container, static void move_out_of_tabs_stacks(struct sway_container *container,
struct sway_container *current, enum movement_direction move_dir, struct sway_container *current, enum movement_direction move_dir,
int offs) { int offs) {
if (container->parent == current->parent
&& current->parent->children->length == 1) {
wlr_log(L_DEBUG, "Changing layout of %zd", current->parent->id);
current->parent->layout = move_dir ==
MOVE_LEFT || move_dir == MOVE_RIGHT ? L_HORIZ : L_VERT;
if (current->parent->type == C_WORKSPACE) {
arrange_workspace(current->parent);
} else {
arrange_children_of(current->parent);
}
return;
}
wlr_log(L_DEBUG, "Moving out of tab/stack into a split"); wlr_log(L_DEBUG, "Moving out of tab/stack into a split");
bool is_workspace = current->parent->type == C_WORKSPACE; bool is_workspace = current->parent->type == C_WORKSPACE;
struct sway_container *old_parent = current->parent->parent; struct sway_container *old_parent = current->parent->parent;