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

Merge pull request #2471 from RyanDwyer/reap-when-floating

Browse Source 
Attempt to reap old tiling parent when floating a container
This commit is contained in:
emersion 2018-08-17 13:37:39 +01:00 committed by GitHub
commit 754bbd03c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sway/tree/container.c
View File

@ -1030,12 +1030,13 @@ void container_set_floating(struct sway_container *container, bool enable) {
struct sway_container *workspace = container_parent(container, C_WORKSPACE); struct sway_container *workspace = container_parent(container, C_WORKSPACE);
if (enable) { if (enable) {
container_remove_child(container); struct sway_container *old_parent = container_remove_child(container);
container_add_child(workspace->sway_workspace->floating, container); container_add_child(workspace->sway_workspace->floating, container);
container_init_floating(container); container_init_floating(container);
if (container->type == C_VIEW) { if (container->type == C_VIEW) {
view_set_tiled(container->sway_view, false); view_set_tiled(container->sway_view, false);
} }
container_reap_empty(old_parent);
} else { } else {
// Returning to tiled // Returning to tiled
if (container->scratchpad) { if (container->scratchpad) {