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

Fix deletion of still-visible workspaces on unfocus

Browse Source
This commit is contained in:
Drew DeVault 2018-04-06 09:26:28 -04:00
parent 3499cc6c87
commit b08f7e5183
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sway/input/seat.c
View File

@ -6,6 +6,7 @@
#include <wlr/types/wlr_output_layout.h> #include <wlr/types/wlr_output_layout.h>
#include <wlr/types/wlr_xcursor_manager.h> #include <wlr/types/wlr_xcursor_manager.h>
#include "sway/tree/container.h" #include "sway/tree/container.h"
#include "sway/tree/workspace.h"
#include "sway/input/seat.h" #include "sway/input/seat.h"
#include "sway/input/cursor.h" #include "sway/input/cursor.h"
#include "sway/input/input-manager.h" #include "sway/input/input-manager.h"
@ -398,7 +399,8 @@ void seat_set_focus_warp(struct sway_seat *seat,
} }
if (last_ws) { if (last_ws) {
ipc_event_workspace(last_ws, container, "focus"); ipc_event_workspace(last_ws, container, "focus");
if (last_ws->children->length == 0) { if (!workspace_is_visible(last_ws)
&& last_ws->children->length == 0) {
container_destroy(last_ws); container_destroy(last_ws);
} }
} }

1
sway/tree/container.c
View File

@ -216,6 +216,7 @@ static bool container_reap_empty(struct sway_container *con) {
break; break;
case C_WORKSPACE: case C_WORKSPACE:
if (!workspace_is_visible(con) && con->children->length == 0) { if (!workspace_is_visible(con) && con->children->length == 0) {
wlr_log(L_DEBUG, "Destroying workspace via reaper");
container_workspace_destroy(con); container_workspace_destroy(con);
return true; return true;
} }