diff options
| author | Drew DeVault <sir@cmpwn.com> | 2016-02-28 15:42:23 -0500 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2016-02-28 15:42:23 -0500 |
| commit | cc170e1b2d403363b001e8382dc542e941406b66 (patch) | |
| tree | 90b0685ec554e95f2eab5cc451e473be3c5b67c0 | |
| parent | 86b894d804e238ba59ceccf51bda114e224076b8 (diff) | |
| parent | 33887e3955c9a34c4edc115e952cca56891b089c (diff) | |
Merge pull request #497 from progandy/swaylock-arrange
swaylock: call arrange_windows for floating change
| -rw-r--r-- | sway/extensions.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/sway/extensions.c b/sway/extensions.c index 9596905c..bd279276 100644 --- a/sway/extensions.c +++ b/sway/extensions.c @@ -108,25 +108,23 @@ 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; desktop_shell.is_locked = true; set_focused_container(view); - arrange_windows(view, -1, -1); + arrange_windows(workspace, -1, -1); list_add(desktop_shell.lock_surfaces, surface); wl_resource_set_destructor(surface, lock_surface_destructor); } else { |