mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix crash when showing scratchpad hidden split containers

This commit is contained in:
Ronan Pigott 2020-01-14 17:08:01 -07:00 committed by Drew DeVault
parent f531e86f7c
commit c52b1cf45a
4 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sway/tree/container.h
View File

@ -357,4 +357,6 @@ void container_raise_floating(struct sway_container *con);
bool container_is_scratchpad_hidden(struct sway_container *con);
bool container_is_scratchpad_hidden_or_child(struct sway_container *con);
#endif

2
sway/commands/focus.c
View File

@ -365,7 +365,7 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
}
if (argc == 0 && container) {
if (container_is_scratchpad_hidden(container)) {
if (container_is_scratchpad_hidden_or_child(container)) {
root_scratchpad_show(container);
}
seat_set_focus_container(seat, container);

7
sway/tree/container.c
View File

@ -1527,3 +1527,10 @@ void container_raise_floating(struct sway_container *con) {
bool container_is_scratchpad_hidden(struct sway_container *con) {
return con->scratchpad && !con->workspace;
}
bool container_is_scratchpad_hidden_or_child(struct sway_container *con) {
while (con->parent) {
con = con->parent;
}
return con->scratchpad && !con->workspace;
}

5
sway/tree/root.c
View File

@ -132,6 +132,11 @@ void root_scratchpad_show(struct sway_container *con) {
if (old_ws) {
container_detach(con);
workspace_consider_destroy(old_ws);
} else {
// Act on the ancestor of scratchpad hidden split containers
while (con->parent) {
con = con->parent;
}
}
workspace_add_floating(new_ws, con);