mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zoom: Change zoom->active to a bool

Browse Source 
Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
This commit is contained in:
Derek Foreman
2015-07-23 14:55:12 -05:00
committed by Bryce Harrington
parent b3463a9e9c
commit a36eb50973
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor.h
+1 -1
View File
@@ -147,7 +147,7 @@ struct weston_fixed_point {
}; };
struct weston_output_zoom { struct weston_output_zoom {
int active; bool active;
float increment; float increment;
float level; float level;
float max_level; float max_level;
src/zoom.c
+4 -3
View File
@@ -26,6 +26,7 @@
#include "config.h" #include "config.h"
#include <stdlib.h> #include <stdlib.h>
#include <stdbool.h>
#include "compositor.h" #include "compositor.h"
#include "text-cursor-position-server-protocol.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 (weston_spring_done(&output->zoom.spring_z)) {
if (output->zoom.active && output->zoom.level <= 0.0) { if (output->zoom.active && output->zoom.level <= 0.0) {
output->zoom.active = 0; output->zoom.active = false;
output->disable_planes--; output->disable_planes--;
wl_list_remove(&output->zoom.motion_listener.link); wl_list_remove(&output->zoom.motion_listener.link);
} }
@@ -160,7 +161,7 @@ weston_output_activate_zoom(struct weston_output *output)
if (output->zoom.active) if (output->zoom.active)
return; return;
output->zoom.active = 1; output->zoom.active = true;
output->disable_planes++; output->disable_planes++;
wl_signal_add(&seat->pointer->motion_signal, wl_signal_add(&seat->pointer->motion_signal,
&output->zoom.motion_listener); &output->zoom.motion_listener);
@@ -169,7 +170,7 @@ weston_output_activate_zoom(struct weston_output *output)
WL_EXPORT void WL_EXPORT void
weston_output_init_zoom(struct weston_output *output) weston_output_init_zoom(struct weston_output *output)
{ {
output->zoom.active = 0; output->zoom.active = false;
output->zoom.increment = 0.07; output->zoom.increment = 0.07;
output->zoom.max_level = 0.95; output->zoom.max_level = 0.95;
output->zoom.level = 0.0; output->zoom.level = 0.0;