summaryrefslogtreecommitdiffstats
path: root/sway/tree/layout.c
diff options
context:
space:
mode:
Diffstat (limited to 'sway/tree/layout.c')
-rw-r--r--sway/tree/layout.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/sway/tree/layout.c b/sway/tree/layout.c
index a060cb85..e91fd5ac 100644
--- a/sway/tree/layout.c
+++ b/sway/tree/layout.c
@@ -403,7 +403,6 @@ void container_move(struct sway_container *container,
403 int limit = container_limit(sibling, move_dir); 403 int limit = container_limit(sibling, move_dir);
404 wlr_log(L_DEBUG, "Reparenting container (paralell)"); 404 wlr_log(L_DEBUG, "Reparenting container (paralell)");
405 limit = limit != 0 ? limit + 1 : limit; // Convert to index 405 limit = limit != 0 ? limit + 1 : limit; // Convert to index
406 wlr_log(L_DEBUG, "Reparenting container (paralell) %d", limit);
407 container_remove_child(container); 406 container_remove_child(container);
408 container_insert_child(sibling, container, limit); 407 container_insert_child(sibling, container, limit);
409 container->width = container->height = 0; 408 container->width = container->height = 0;
@@ -431,6 +430,18 @@ void container_move(struct sway_container *container,
431 container_type_to_str(sibling->type)); 430 container_type_to_str(sibling->type));
432 return; 431 return;
433 } 432 }
433
434 struct sway_container *last_ws = old_parent;
435 struct sway_container *next_ws = container->parent;
436 if (last_ws && last_ws->type != C_WORKSPACE) {
437 last_ws = container_parent(last_ws, C_WORKSPACE);
438 }
439 if (next_ws && next_ws->type != C_WORKSPACE) {
440 next_ws = container_parent(next_ws, C_WORKSPACE);
441 }
442 if (last_ws && next_ws && last_ws != next_ws) {
443 ipc_event_workspace(last_ws, container, "focus");
444 }
434} 445}
435 446
436enum sway_container_layout container_get_default_layout( 447enum sway_container_layout container_get_default_layout(