mirror of
https://github.com/swaywm/sway.git
synced 2024-12-28 07:56:31 +01:00
sway: set lock view to floating after ws switch
This avoids calling swayc_active_workspace.
This commit is contained in:
parent
86b894d804
commit
52ff89cecc
1 changed files with 5 additions and 7 deletions
|
@ -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));
|
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) {
|
||||||
|
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
|
// make the view floating so it doesn't rearrange other
|
||||||
// siblings.
|
// siblings.
|
||||||
if (!view->is_floating) {
|
if (!view->is_floating) {
|
||||||
// Remove view from its current location
|
// Remove view from its current location
|
||||||
destroy_container(remove_child(view));
|
destroy_container(remove_child(view));
|
||||||
|
|
||||||
// and move it into workspace floating
|
// and move it into workspace floating
|
||||||
add_floating(swayc_active_workspace(), view);
|
add_floating(workspace, view);
|
||||||
}
|
|
||||||
|
|
||||||
swayc_t *workspace = output->focused;
|
|
||||||
if (!swayc_is_child_of(view, workspace)) {
|
|
||||||
move_container_to(view, workspace);
|
|
||||||
}
|
}
|
||||||
wlc_view_set_state(view->handle, WLC_BIT_FULLSCREEN, true);
|
wlc_view_set_state(view->handle, WLC_BIT_FULLSCREEN, true);
|
||||||
workspace->fullscreen = view;
|
workspace->fullscreen = view;
|
||||||
|
|
Loading…
Reference in a new issue