diff options
| author | Derek Foreman <derekf@osg.samsung.com> | 2015-07-23 14:55:15 -0500 |
|---|---|---|
| committer | Bryce Harrington <bryce@osg.samsung.com> | 2015-07-29 19:54:17 -0700 |
| commit | 22276a596a9a73281d9a76e718e1d37ad9edac7a (patch) | |
| tree | 13b0dd8250f7fce91aba07ca14eae6eb267e3e87 /desktop-shell | |
| parent | 25bd8a71fc7ca7015b03138490545ddc7f10c0d4 (diff) | |
zoom: Store the seat that initiated a zoom
Track the seat that initiated a seat instead of picking the first one.
Previously, if there are multiple seats then any seat can adjust the zoom
level but the zoom tracks the first seat's pointer.
Now the zoom will follow the pointer of the seat that initiated the zoom.
Additionally, if there's no pointer in the first seat, starting a zoom
with the second seat will no longer crash weston.
Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Diffstat (limited to 'desktop-shell')
| -rw-r--r-- | desktop-shell/shell.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c index 48bee343..dec9169b 100644 --- a/desktop-shell/shell.c +++ b/desktop-shell/shell.c @@ -4808,7 +4808,7 @@ do_zoom(struct weston_seat *seat, uint32_t time, uint32_t key, uint32_t axis, if (!output->zoom.active) { if (output->zoom.level <= 0.0) continue; - weston_output_activate_zoom(output); + weston_output_activate_zoom(output, seat); } output->zoom.spring_z.target = output->zoom.level; |