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

Merge pull request #2230 from vilhalmer/replace-empty-workspace

Browse source 
Replace empty workspace with moved workspace
This commit is contained in:
emersion 2018-07-09 19:04:25 +01:00 committed by GitHub
parent 6595d07ec7 4e7ef1dd39
commit d97b4fa4ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sway/tree/layout.c
View file

@ -168,7 +168,12 @@ void container_move_to(struct sway_container *container,
struct sway_container *old_parent = container_remove_child(container); struct sway_container *old_parent = container_remove_child(container);
container->width = container->height = 0; container->width = container->height = 0;
container->saved_width = container->saved_height = 0; container->saved_width = container->saved_height = 0;
struct sway_container *new_parent;
struct sway_container *new_parent, *new_parent_focus;
struct sway_seat *seat = input_manager_get_default_seat(input_manager);
// Get the focus of the destination before we change it.
new_parent_focus = seat_get_focus_inactive(seat, destination);
if (destination->type == C_VIEW) { if (destination->type == C_VIEW) {
new_parent = container_add_sibling(destination, container); new_parent = container_add_sibling(destination, container);
} else { } else {
@ -176,17 +181,20 @@ void container_move_to(struct sway_container *container,
container_add_child(destination, container); container_add_child(destination, container);
} }
wl_signal_emit(&container->events.reparent, old_parent); wl_signal_emit(&container->events.reparent, old_parent);
if (container->type == C_WORKSPACE) { if (container->type == C_WORKSPACE) {
// If moving a workspace to a new output, maybe create a new workspace // If moving a workspace to a new output, maybe create a new workspace
// on the previous output // on the previous output
struct sway_seat *seat = input_manager_get_default_seat(input_manager);
if (old_parent->children->length == 0) { if (old_parent->children->length == 0) {
char *ws_name = workspace_next_name(old_parent->name); char *ws_name = workspace_next_name(old_parent->name);
struct sway_container *ws = struct sway_container *ws = workspace_create(old_parent, ws_name);
workspace_create(old_parent, ws_name);
free(ws_name); free(ws_name);
seat_set_focus(seat, ws); seat_set_focus(seat, ws);
} }
// Try to remove an empty workspace from the destination output.
container_reap_empty_recursive(new_parent_focus);
container_sort_workspaces(new_parent); container_sort_workspaces(new_parent);
seat_set_focus(seat, new_parent); seat_set_focus(seat, new_parent);
workspace_output_raise_priority(container, old_parent, new_parent); workspace_output_raise_priority(container, old_parent, new_parent);