desktop-shell: Simplify confusing conditional

The only place we ever set shsurf->fullscreen.black_view is when we're
going into fullscreen, and we destroy it when we're going out of
fullscreen. Hence if we do ever have a fullscreen black view, we should
move it out of the way.

Signed-off-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Daniel Stone 2023-07-11 17:14:27 +01:00 committed by Marius Vlad
parent a019aa6b2a
commit e32557131e

View File

@ -3664,12 +3664,8 @@ lower_fullscreen_layer(struct desktop_shell *shell,
if (lowering_output && (shsurf->fullscreen_output != lowering_output))
continue;
/* We can have a non-fullscreen popup for a fullscreen surface
* in the fullscreen layer. */
if (weston_desktop_surface_get_fullscreen(shsurf->desktop_surface) &&
shsurf->fullscreen.black_view) {
if (shsurf->fullscreen.black_view)
weston_view_move_to_layer(shsurf->fullscreen.black_view->view, NULL);
}
/* Lower the view to the workspace layer */
weston_view_move_to_layer(view, &ws->layer.view_list);