[PATCH v2 weston 1/4] zoom: Change zoom->active to a bool

[Bryce Harrington]

On Thu, Jul 23, 2015 at 03:44:35PM -0700, Bryce Harrington wrote:
> On Thu, Jul 23, 2015 at 02:55:12PM -0500, Derek Foreman wrote:
> > Signed-off-by: Derek Foreman <derekf at osg.samsung.com>
> 
> Reviewed-by: Bryce Harrington <bryce at osg.samsung.com>

To ssh://git.freedesktop.org/git/wayland/weston
   b3463a9..a36eb50  master -> master

 
> > ---
> >  src/compositor.h | 2 +-
> >  src/zoom.c       | 7 ++++---
> >  2 files changed, 5 insertions(+), 4 deletions(-)
> > 
> > diff --git a/src/compositor.h b/src/compositor.h
> > index d0c6034..b69547f 100644
> > --- a/src/compositor.h
> > +++ b/src/compositor.h
> > @@ -147,7 +147,7 @@ struct weston_fixed_point {
> >  };
> >  
> >  struct weston_output_zoom {
> > -	int active;
> > +	bool active;
> >  	float increment;
> >  	float level;
> >  	float max_level;
> > diff --git a/src/zoom.c b/src/zoom.c
> > index 4216607..878ecc2 100644
> > --- a/src/zoom.c
> > +++ b/src/zoom.c
> > @@ -26,6 +26,7 @@
> >  #include "config.h"
> >  
> >  #include <stdlib.h>
> > +#include <stdbool.h>
> >  
> >  #include "compositor.h"
> >  #include "text-cursor-position-server-protocol.h"
> > @@ -47,7 +48,7 @@ weston_zoom_frame_z(struct weston_animation *animation,
> >  
> >  	if (weston_spring_done(&output->zoom.spring_z)) {
> >  		if (output->zoom.active && output->zoom.level <= 0.0) {
> > -			output->zoom.active = 0;
> > +			output->zoom.active = false;
> >  			output->disable_planes--;
> >  			wl_list_remove(&output->zoom.motion_listener.link);
> >  		}
> > @@ -160,7 +161,7 @@ weston_output_activate_zoom(struct weston_output *output)
> >  	if (output->zoom.active)
> >  		return;
> >  
> > -	output->zoom.active = 1;
> > +	output->zoom.active = true;
> >  	output->disable_planes++;
> >  	wl_signal_add(&seat->pointer->motion_signal,
> >  		      &output->zoom.motion_listener);
> > @@ -169,7 +170,7 @@ weston_output_activate_zoom(struct weston_output *output)
> >  WL_EXPORT void
> >  weston_output_init_zoom(struct weston_output *output)
> >  {
> > -	output->zoom.active = 0;
> > +	output->zoom.active = false;
> >  	output->zoom.increment = 0.07;
> >  	output->zoom.max_level = 0.95;
> >  	output->zoom.level = 0.0;
> > -- 
> > 2.1.4
> > 
> > _______________________________________________
> > wayland-devel mailing list
> > wayland-devel at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/wayland-devel
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel