commit 25bd8a71fc7ca7015b03138490545ddc7f10c0d4
author Derek Foreman <derekf@osg.samsung.com> Thu Jul 23 14:55:13 2015 -0500
committer Bryce Harrington <bryce@osg.samsung.com> Wed Jul 29 19:47:31 2015 -0700
tree 6eb34afd08f6072abad70c58328b26f5f6beb07d
parent 859b52b62e043b89e8d6da4b4a2ee27c79a796ea

zoom: Call weston_output_activate_zoom() appropriately

No longer call weston_output_update_zoom() when trying to zoom out
on an unzoomed output.

Add an assert() to make sure update_zoom is never called without an
active zoom.

Signed-off-by: Derek Foreman <derekf@osg.samsung.com>

desktop-shell/shell.c

diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index 9e3701f..48bee34 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -4804,7 +4804,10 @@
 				output->zoom.level = 0.0;
 			else if (output->zoom.level > output->zoom.max_level)
 				output->zoom.level = output->zoom.max_level;
-			else if (!output->zoom.active) {
+
+			if (!output->zoom.active) {
+				if (output->zoom.level <= 0.0)
+					continue;
 				weston_output_activate_zoom(output);
 			}
 

src/zoom.c

diff --git a/src/zoom.c b/src/zoom.c
index 6305427..18fc7ca 100644
--- a/src/zoom.c
+++ b/src/zoom.c
@@ -25,6 +25,7 @@
 
 #include "config.h"
 
+#include <assert.h>
 #include <stdlib.h>
 #include <stdbool.h>
 
@@ -135,6 +136,8 @@
 {
 	struct weston_seat *seat = weston_zoom_pick_seat(output->compositor);
 
+	assert(output->zoom.active);
+
 	output->zoom.current.x = seat->pointer->x;
 	output->zoom.current.y = seat->pointer->y;