diff options
| author | Derek Foreman <derekf@osg.samsung.com> | 2015-07-23 14:55:13 -0500 |
|---|---|---|
| committer | Bryce Harrington <bryce@osg.samsung.com> | 2015-07-29 19:47:31 -0700 |
| commit | 25bd8a71fc7ca7015b03138490545ddc7f10c0d4 (patch) | |
| tree | 6eb34afd08f6072abad70c58328b26f5f6beb07d /desktop-shell | |
| parent | 859b52b62e043b89e8d6da4b4a2ee27c79a796ea (diff) | |
| download | weston-25bd8a71fc7ca7015b03138490545ddc7f10c0d4.tar.gz weston-25bd8a71fc7ca7015b03138490545ddc7f10c0d4.tar.bz2 weston-25bd8a71fc7ca7015b03138490545ddc7f10c0d4.zip | |
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>
Diffstat (limited to 'desktop-shell')
| -rw-r--r-- | desktop-shell/shell.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c index 9e3701fc..48bee343 100644 --- a/desktop-shell/shell.c +++ b/desktop-shell/shell.c @@ -4804,7 +4804,10 @@ do_zoom(struct weston_seat *seat, uint32_t time, uint32_t key, uint32_t axis, 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); } |