system/weston
system/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston synced 2024-10-03 03:31:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

desktop-shell: Use weston_view_move_to_layer for focus animation

Browse source 
Rather than juggling our layers manually, just use
weston_view_move_to_layer. This obviates the need for manually marking
the view as mapped.

Signed-off-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Daniel Stone 2023-07-12 10:48:39 +01:00 committed by Marius Vlad
parent db97820919
commit 6738c738ab
1 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
desktop-shell/shell.c
View file

@ -646,8 +646,6 @@ create_focus_surface(struct weston_compositor *ec,
fsurf->curtain = weston_shell_utils_curtain_create(ec, &curtain_params); fsurf->curtain = weston_shell_utils_curtain_create(ec, &curtain_params);
weston_view_set_output(fsurf->curtain->view, output); weston_view_set_output(fsurf->curtain->view, output);
/* XXX: can't map view without a layer! */
fsurf->curtain->view->is_mapped = true;
return fsurf; return fsurf;
} }
@ -879,8 +877,8 @@ animate_focus_change(struct desktop_shell *shell, struct workspace *ws,
focus_surface_created = true; focus_surface_created = true;
} else { } else {
weston_layer_entry_remove(&ws->fsurf_front->curtain->view->layer_link); weston_view_move_to_layer(ws->fsurf_front->curtain->view, NULL);
weston_layer_entry_remove(&ws->fsurf_back->curtain->view->layer_link); weston_view_move_to_layer(ws->fsurf_back->curtain->view, NULL);
} }
if (ws->focus_animation) { if (ws->focus_animation) {
@ -888,12 +886,13 @@ animate_focus_change(struct desktop_shell *shell, struct workspace *ws,
ws->focus_animation = NULL; ws->focus_animation = NULL;
} }
if (to) if (to) {
weston_layer_entry_insert(&to->layer_link, weston_view_move_to_layer(ws->fsurf_front->curtain->view,
&ws->fsurf_front->curtain->view->layer_link); &to->layer_link);
else if (from) } else if (from) {
weston_layer_entry_insert(&ws->layer.view_list, weston_view_move_to_layer(ws->fsurf_front->curtain->view,
&ws->fsurf_front->curtain->view->layer_link); &ws->layer.view_list);
}
if (focus_surface_created) { if (focus_surface_created) {
ws->focus_animation = weston_fade_run( ws->focus_animation = weston_fade_run(
@ -901,15 +900,15 @@ animate_focus_change(struct desktop_shell *shell, struct workspace *ws,
ws->fsurf_front->curtain->view->alpha, 0.4, 300, ws->fsurf_front->curtain->view->alpha, 0.4, 300,
focus_animation_done, ws); focus_animation_done, ws);
} else if (from) { } else if (from) {
weston_layer_entry_insert(&from->layer_link, weston_view_move_to_layer(ws->fsurf_back->curtain->view,
&ws->fsurf_back->curtain->view->layer_link); &from->layer_link);
ws->focus_animation = weston_stable_fade_run( ws->focus_animation = weston_stable_fade_run(
ws->fsurf_front->curtain->view, 0.0, ws->fsurf_front->curtain->view, 0.0,
ws->fsurf_back->curtain->view, 0.4, ws->fsurf_back->curtain->view, 0.4,
focus_animation_done, ws); focus_animation_done, ws);
} else if (to) { } else if (to) {
weston_layer_entry_insert(&ws->layer.view_list, weston_view_move_to_layer(ws->fsurf_back->curtain->view,
&ws->fsurf_back->curtain->view->layer_link); &ws->layer.view_list);
ws->focus_animation = weston_stable_fade_run( ws->focus_animation = weston_stable_fade_run(
ws->fsurf_front->curtain->view, 0.0, ws->fsurf_front->curtain->view, 0.0,
ws->fsurf_back->curtain->view, 0.4, ws->fsurf_back->curtain->view, 0.4,