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

Improve move command with tabbed/stacked layout

Browse source
This commit is contained in:
Mikkel Oscar Lyderik 2016-04-01 21:39:15 +02:00
parent d26658fb35
commit a0cebb7c5a
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sway/debug_log.c
View file

@ -38,6 +38,7 @@ static void container_log(const swayc_t *c, int depth) {
c->layout == L_HORIZ ? "Horiz": c->layout == L_HORIZ ? "Horiz":
c->layout == L_VERT ? "Vert": c->layout == L_VERT ? "Vert":
c->layout == L_STACKED ? "Stack": c->layout == L_STACKED ? "Stack":
c->layout == L_TABBED ? "Tab":
c->layout == L_FLOATING ? "Float": c->layout == L_FLOATING ? "Float":
"Unknown"); "Unknown");
fprintf(stderr, "w:%4.f|h:%4.f|", c->width, c->height); fprintf(stderr, "w:%4.f|h:%4.f|", c->width, c->height);

12
sway/layout.c
View file

@ -244,7 +244,9 @@ void move_container(swayc_t *container, enum movement_direction dir) {
while (true) { while (true) {
sway_log(L_DEBUG, "container:%p, parent:%p, child %p,", sway_log(L_DEBUG, "container:%p, parent:%p, child %p,",
container,parent,child); container,parent,child);
if (parent->layout == layout) { if (parent->layout == layout
|| (parent->layout == L_TABBED && layout == L_HORIZ)
|| (parent->layout == L_STACKED && layout == L_VERT)) {
int diff; int diff;
// If it has ascended (parent has moved up), no container is removed // If it has ascended (parent has moved up), no container is removed
// so insert it at index, or index+1. // so insert it at index, or index+1.
@ -264,9 +266,11 @@ void move_container(swayc_t *container, enum movement_direction dir) {
// Move container into sibling container // Move container into sibling container
if (child->type == C_CONTAINER) { if (child->type == C_CONTAINER) {
parent = child; parent = child;
// Insert it in first/last if matching layout,otherwise // Insert it in first/last if matching layout, otherwise
// inesrt it next to focused container // inesrt it next to focused container
if (parent->layout == layout) { if (parent->layout == layout
|| (parent->layout == L_TABBED && layout == L_HORIZ)
|| (parent->layout == L_STACKED && layout == L_VERT)) {
desired = (diff < 0) * parent->children->length; desired = (diff < 0) * parent->children->length;
} else { } else {
desired = index_child(child->focused); desired = index_child(child->focused);
@ -300,7 +304,7 @@ void move_container(swayc_t *container, enum movement_direction dir) {
parent = child->parent; parent = child->parent;
} }
// Dirty hack to fix a certain case // Dirty hack to fix a certain case
arrange_windows(parent, -1, -1); /* arrange_windows(parent, -1, -1); */
arrange_windows(parent->parent, -1, -1); arrange_windows(parent->parent, -1, -1);
set_focused_container_for(parent->parent, container); set_focused_container_for(parent->parent, container);
} }