Merge pull request #493 from mikkeloscar/view-behind-swaylock

Don't rearrange views behind swaylock.
This commit is contained in:
Drew DeVault 2016-02-25 09:02:47 -05:00
commit 28c8e4fb9e

View file

@ -108,6 +108,16 @@ 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)); swayc_t *view = swayc_by_handle(wlc_handle_from_wl_surface_resource(surface));
sway_log(L_DEBUG, "Setting lock surface to %p", view); sway_log(L_DEBUG, "Setting lock surface to %p", view);
if (view && output) { if (view && output) {
// 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; swayc_t *workspace = output->focused;
if (!swayc_is_child_of(view, workspace)) { if (!swayc_is_child_of(view, workspace)) {
move_container_to(view, workspace); move_container_to(view, workspace);