From 90c2789e8d83a5b090cf4b91a6770a93f08028a0 Mon Sep 17 00:00:00 2001 From: Nobuhiko Tanibata Date: Sat, 26 Dec 2015 23:52:51 +0900 Subject: [PATCH] ivi-layout: apply opacity to weston_view correctly update_opacity is only called when a ivi-surface is visible. But the previous code also checks event masks redundantly. However if the event happens when ivi-surface is invisible, opacity is not calculated. This patch removes this redundant check to fix potential bug. Signed-off-by: Nobuhiko Tanibata Reviewed-by: Pekka Paalanen --- ivi-shell/ivi-layout.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c index 4ad7a5f5..f7c4f273 100644 --- a/ivi-shell/ivi-layout.c +++ b/ivi-shell/ivi-layout.c @@ -322,12 +322,9 @@ update_opacity(struct ivi_layout_layer *ivilayer, double layer_alpha = wl_fixed_to_double(ivilayer->prop.opacity); double surf_alpha = wl_fixed_to_double(ivisurf->prop.opacity); - if ((ivilayer->event_mask & IVI_NOTIFICATION_OPACITY) || - (ivisurf->event_mask & IVI_NOTIFICATION_OPACITY)) { - tmpview = get_weston_view(ivisurf); - assert(tmpview != NULL); - tmpview->alpha = layer_alpha * surf_alpha; - } + tmpview = get_weston_view(ivisurf); + assert(tmpview != NULL); + tmpview->alpha = layer_alpha * surf_alpha; } static void