This patch changes the zoom binding to use the modifier configured in
weston.ini instead of hardcoding MODIFIER_SUPER.

Signed-off-by: Ian Ray <[email protected]>
---
 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 415da19..3872686 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,
-- 
2.7.4

_______________________________________________
wayland-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/wayland-devel

Reply via email to