mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-28 07:56:31 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix crash when showing scratchpad hidden split containers

Browse source
This commit is contained in:
Ronan Pigott 2020-01-14 17:08:01 -07:00 committed by Brian Ashworth
parent 18507e62fd
commit d88d4bbd9d
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(struct sway_container *con);
bool container_is_scratchpad_hidden_or_child(struct sway_container *con);
#endif #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 (argc == 0 && container) {
if (container_is_scratchpad_hidden(container)) { if (container_is_scratchpad_hidden_or_child(container)) {
root_scratchpad_show(container); root_scratchpad_show(container);
} }
seat_set_focus_container(seat, 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) { bool container_is_scratchpad_hidden(struct sway_container *con) {
return con->scratchpad && !con->workspace; 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) { if (old_ws) {
container_detach(con); container_detach(con);
workspace_consider_destroy(old_ws); 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); workspace_add_floating(new_ws, con);