From ab7c0b6afd76448d5d84e9f81830b3531d7cff4f Mon Sep 17 00:00:00 2001 From: Ian Ray <ian.ray@ge.com> Date: Mon, 18 Sep 2017 15:22:00 +0300 Subject: [PATCH] desktop-shell: use binding_modifier for zoom This patch changes the zoom binding to use the modifier configured in weston.ini instead of hardcoding MODIFIER_SUPER. Signed-off-by: Ian Ray <ian.ray@ge.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> --- desktop-shell/shell.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c index 415da1928..3872686a5 100644 --- a/desktop-shell/shell.c +++ b/desktop-shell/shell.c @@ -4863,9 +4863,6 @@ shell_add_bindings(struct weston_compositor *ec, struct desktop_shell *shell) weston_compositor_add_axis_binding(ec, WL_POINTER_AXIS_VERTICAL_SCROLL, MODIFIER_SUPER | MODIFIER_ALT, surface_opacity_binding, NULL); - weston_compositor_add_axis_binding(ec, WL_POINTER_AXIS_VERTICAL_SCROLL, - MODIFIER_SUPER, zoom_axis_binding, - NULL); weston_compositor_add_key_binding(ec, KEY_BRIGHTNESSDOWN, 0, backlight_binding, ec); weston_compositor_add_key_binding(ec, KEY_BRIGHTNESSUP, 0, @@ -4880,6 +4877,10 @@ shell_add_bindings(struct weston_compositor *ec, struct desktop_shell *shell) if (!mod) return; + weston_compositor_add_axis_binding(ec, WL_POINTER_AXIS_VERTICAL_SCROLL, + mod, zoom_axis_binding, + NULL); + weston_compositor_add_key_binding(ec, KEY_PAGEUP, mod, zoom_key_binding, NULL); weston_compositor_add_key_binding(ec, KEY_PAGEDOWN, mod, -- GitLab