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>
This commit is contained in:
parent
e80bdcdad2
commit
ab7c0b6afd
|
@ -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,
|
weston_compositor_add_axis_binding(ec, WL_POINTER_AXIS_VERTICAL_SCROLL,
|
||||||
MODIFIER_SUPER | MODIFIER_ALT,
|
MODIFIER_SUPER | MODIFIER_ALT,
|
||||||
surface_opacity_binding, NULL);
|
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,
|
weston_compositor_add_key_binding(ec, KEY_BRIGHTNESSDOWN, 0,
|
||||||
backlight_binding, ec);
|
backlight_binding, ec);
|
||||||
weston_compositor_add_key_binding(ec, KEY_BRIGHTNESSUP, 0,
|
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)
|
if (!mod)
|
||||||
return;
|
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,
|
weston_compositor_add_key_binding(ec, KEY_PAGEUP, mod,
|
||||||
zoom_key_binding, NULL);
|
zoom_key_binding, NULL);
|
||||||
weston_compositor_add_key_binding(ec, KEY_PAGEDOWN, mod,
|
weston_compositor_add_key_binding(ec, KEY_PAGEDOWN, mod,
|
||||||
|
|
Loading…
Reference in New Issue