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

layout: swap_container: Handle floating views.

Browse source
This commit is contained in:
S. Christoffer Eliesen 2015-11-24 20:58:02 +01:00
parent ed1b0bffbc
commit b5ddad4bf6
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sway/layout.c
View file

@ -174,7 +174,6 @@ swayc_t *remove_child(swayc_t *child) {
} }
void swap_container(swayc_t *a, swayc_t *b) { void swap_container(swayc_t *a, swayc_t *b) {
//TODO doesnt handle floating <-> tiling swap
if (!sway_assert(a&&b, "parameters must be non null") || if (!sway_assert(a&&b, "parameters must be non null") ||
!sway_assert(a->parent && b->parent, "containers must have parents")) { !sway_assert(a->parent && b->parent, "containers must have parents")) {
return; return;
@ -184,8 +183,16 @@ void swap_container(swayc_t *a, swayc_t *b) {
swayc_t *a_parent = a->parent; swayc_t *a_parent = a->parent;
swayc_t *b_parent = b->parent; swayc_t *b_parent = b->parent;
// Swap the pointers // Swap the pointers
if (a->is_floating) {
a_parent->floating->items[a_index] = b;
} else {
a_parent->children->items[a_index] = b; a_parent->children->items[a_index] = b;
}
if (b->is_floating) {
b_parent->floating->items[b_index] = a;
} else {
b_parent->children->items[b_index] = a; b_parent->children->items[b_index] = a;
}
a->parent = b_parent; a->parent = b_parent;
b->parent = a_parent; b->parent = a_parent;
if (a_parent->focused == a) { if (a_parent->focused == a) {