On Sat, 26 Dec 2015 23:52:51 +0900
Nobuhiko Tanibata <[email protected]> wrote:

> From: Nobuhiko Tanibata <[email protected]>
> 
> 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 <[email protected]>
> 
> ---
>  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

Attachment: pgpH_l3a0f9xB.pgp
Description: OpenPGP digital signature

_______________________________________________
wayland-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/wayland-devel

Reply via email to