mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ivi-layout: Use weston_view_move_to_layer()

Browse Source 
Use the weston_view_move_to_layer() helper instead of calling
weston_layer_entry_insert() / weston_view_unmap() directly.

This requires us to stop just clearing out the layer view list and then
adding visible surfaces' views to it. Instead, we have to explicitly
move all views onto or off of the layers.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
This commit is contained in:
Philipp Zabel 2023-07-13 12:58:20 +02:00 committed by Marius Vlad
parent d0dc464f15
commit 1ad9687571
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ivi-shell/ivi-layout.c
View File

@ -847,26 +847,22 @@ build_view_list(struct ivi_layout *layout)
*/ */
wl_list_for_each(ivi_view, &layout->view_list, link) { wl_list_for_each(ivi_view, &layout->view_list, link) {
if (!ivi_view_is_mapped(ivi_view)) if (!ivi_view_is_mapped(ivi_view))
weston_view_unmap(ivi_view->view); weston_view_move_to_layer(ivi_view->view, NULL);
} }
/* Clear view list of layout ivi_layer */
wl_list_init(&layout->layout_layer.view_list.link);
wl_list_for_each(iviscrn, &layout->screen_list, link) { wl_list_for_each(iviscrn, &layout->screen_list, link) {
wl_list_for_each(ivilayer, &iviscrn->order.layer_list, order.link) { wl_list_for_each(ivilayer, &iviscrn->order.layer_list, order.link) {
if (ivilayer->prop.visibility == false)
continue;
wl_list_for_each(ivi_view, &ivilayer->order.view_list, order_link) { wl_list_for_each(ivi_view, &ivilayer->order.view_list, order_link) {
if (ivi_view->ivisurf->prop.visibility == false) if (ivilayer->prop.visibility == false ||
ivi_view->ivisurf->prop.visibility == false) {
weston_view_move_to_layer(ivi_view->view,
NULL);
continue; continue;
}
weston_layer_entry_insert(&layout->layout_layer.view_list,
&ivi_view->view->layer_link);
weston_surface_map(ivi_view->ivisurf->surface); weston_surface_map(ivi_view->ivisurf->surface);
ivi_view->view->is_mapped = true; weston_view_move_to_layer(ivi_view->view,
&layout->layout_layer.view_list);
} }
} }
} }