sway

commit 52ff89cecc817c34b61f31c344f03137279c2e3d
parent 86b894d804e238ba59ceccf51bda114e224076b8
Author: progandy <code@progandy>
Date:   Sun, 28 Feb 2016 20:12:07 +0100

sway: set lock view to floating after ws switch

This avoids calling swayc_active_workspace.

Diffstat:
M
sway/extensions.c
 | 
12
+++++-------

1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/sway/extensions.c b/sway/extensions.c
@@ -108,19 +108,17 @@ static void set_lock_surface(struct wl_client *client, struct wl_resource *resou
 	swayc_t *view = swayc_by_handle(wlc_handle_from_wl_surface_resource(surface));
 	sway_log(L_DEBUG, "Setting lock surface to %p", view);
 	if (view && output) {
+		swayc_t *workspace = output->focused;
+		if (!swayc_is_child_of(view, workspace)) {
+			move_container_to(view, workspace);
+		}
 		// make the view floating so it doesn't rearrange other
 		// siblings.
 		if (!view->is_floating) {
 			// Remove view from its current location
 			destroy_container(remove_child(view));
-
 			// and move it into workspace floating
-			add_floating(swayc_active_workspace(), view);
-		}
-
-		swayc_t *workspace = output->focused;
-		if (!swayc_is_child_of(view, workspace)) {
-			move_container_to(view, workspace);
+			add_floating(workspace, view);
 		}
 		wlc_view_set_state(view->handle, WLC_BIT_FULLSCREEN, true);
 		workspace->fullscreen = view;