From dbf4aa3e33bdee53876c6893b15ac3f224818e7c Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Wed, 5 Sep 2018 17:59:31 +1000 Subject: Allow marked containers to be moved out of the scratchpad via move command --- sway/tree/container.c | 10 ++++++---- sway/tree/view.c | 4 ++++ 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'sway/tree') diff --git a/sway/tree/container.c b/sway/tree/container.c index fbce8158..c91b0361 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -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); } diff --git a/sway/tree/view.c b/sway/tree/view.c index e2d74735..f63a35b5 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -164,6 +164,10 @@ uint32_t view_configure(struct sway_view *view, double lx, double ly, int width, } void view_autoconfigure(struct sway_view *view) { + if (!view->container->workspace) { + // Hidden in the scratchpad + return; + } struct sway_output *output = view->container->workspace->output; if (view->container->is_fullscreen) { -- cgit v1.2.3-54-g00ecf