mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-04 13:29:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow marked containers to be moved out of the scratchpad via move command

Browse source
This commit is contained in:
Ryan Dwyer 2018-09-05 17:59:31 +10:00
parent 1f2e0ff54b
commit dbf4aa3e33
3 changed files with 30 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sway/tree/container.c
View file

@ -1116,9 +1116,11 @@ void container_detach(struct sway_container *child) {
struct sway_container *old_parent = child->parent;
struct sway_workspace *old_workspace = child->workspace;
list_t *siblings = container_get_siblings(child);
int index = list_find(siblings, child);
if (index != -1) {
list_del(siblings, index);
if (siblings) {
int index = list_find(siblings, child);
if (index != -1) {
list_del(siblings, index);
}
}
child->parent = NULL;
child->workspace = NULL;
@ -1127,7 +1129,7 @@ void container_detach(struct sway_container *child) {
if (old_parent) {
container_update_representation(old_parent);
node_set_dirty(&old_parent->node);
} else {
} else if (old_workspace) {
workspace_update_representation(old_workspace);
node_set_dirty(&old_workspace->node);
}