From 82efd1a2fa1fa6c586e5a47e5baf1d85d335e1f0 Mon Sep 17 00:00:00 2001 From: Janos Kovacs Date: Sat, 9 Aug 2014 11:44:11 +0300 Subject: [PATCH] downstream: ivi-shell: start to use weston_view_unmap() Change-Id: I777e491cca44c7bdd73da51538065f1c2dbad90e Signed-off-by: Janos Kovacs --- ivi-shell/ivi-layout.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c index fe55297..0b00a76 100644 --- a/ivi-shell/ivi-layout.c +++ b/ivi-shell/ivi-layout.c @@ -838,6 +838,8 @@ commit_layer_list(struct ivi_layout *layout) } } + + static void commit_screen_list(struct ivi_layout *layout) { @@ -898,22 +900,22 @@ commit_screen_list(struct ivi_layout *layout) continue; wl_list_for_each(ivisurf, &ivilayer->order.surface_list, order.link) { - struct weston_view *tmpview = NULL; - wl_list_for_each(tmpview, &ivisurf->surface->views, surface_link) { - if (tmpview != NULL) { - break; - } - } - - if (ivisurf->prop.visibility == false) - continue; - if (ivisurf->surface == NULL || tmpview == NULL) + if (ivisurf->surface == NULL || ivisurf->view == NULL) continue; - weston_layer_entry_insert(&layout->layout_layer.view_list, - &tmpview->layer_link); + if (ivilayer->prop.visibility == false || + ivisurf->prop.visibility == false) { + weston_view_unmap(ivisurf->view); + } + else { + weston_layer_entry_insert(&layout->layout_layer.view_list, + &ivisurf->view->layer_link); - ivisurf->surface->output = iviscrn->output; + if (!weston_view_is_mapped(ivisurf->view)) { + weston_view_geometry_dirty(ivisurf->view); + weston_view_update_transform(ivisurf->view); + } + } } } -- 2.7.4