[PATCH weston] ivi-layout: apply opacity to weston_view correctly

[Pekka Paalanen]

On Sat, 26 Dec 2015 23:52:51 +0900
Nobuhiko Tanibata <nobuhiko_tanibata at xddp.denso.co.jp> wrote:

> From: Nobuhiko Tanibata <NOBUHIKO_TANIBATA at xddp.denso.co.jp>
> 
> 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 <NOBUHIKO_TANIBATA at xddp.denso.co.jp>
> 
> ---
>  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 b90a437..3de1405 100644
> --- a/ivi-shell/ivi-layout.c
> +++ b/ivi-shell/ivi-layout.c
> @@ -325,12 +325,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

Hi,

looks fine by me, and is a very low-risk fix, so pushed even when we
are at beta now:
   0cc4e98..90c2789  master -> master


Thanks,
pq
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 811 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freedesktop.org/archives/wayland-devel/attachments/20160203/59ba8e88/attachment.sig>