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

Merge pull request #2028 from RyanDwyer/fix-move-workspace

Browse source 
Fix crash in move workspace to output command
This commit is contained in:
Drew DeVault 2018-05-24 09:17:40 -04:00 committed by GitHub
parent 66b93c1c18 c9630975da
commit 3c77f066a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sway/tree/layout.c
View file

@ -187,9 +187,17 @@ void container_move_to(struct sway_container *container,
container_notify_child_title_changed(old_parent); container_notify_child_title_changed(old_parent);
container_notify_child_title_changed(new_parent); container_notify_child_title_changed(new_parent);
if (old_parent) { if (old_parent) {
arrange_children_of(old_parent); if (old_parent->type == C_OUTPUT) {
arrange_output(old_parent);
} else {
arrange_children_of(old_parent);
}
}
if (new_parent->type == C_OUTPUT) {
arrange_output(new_parent);
} else {
arrange_children_of(new_parent);
} }
arrange_children_of(new_parent);
// If view was moved to a fullscreen workspace, refocus the fullscreen view // If view was moved to a fullscreen workspace, refocus the fullscreen view
struct sway_container *new_workspace = container; struct sway_container *new_workspace = container;
if (new_workspace->type != C_WORKSPACE) { if (new_workspace->type != C_WORKSPACE) {