diff options
author | Rui Matos <tiagomatos@gmail.com> | 2017-02-13 14:06:35 +0100 |
---|---|---|
committer | Rui Matos <tiagomatos@gmail.com> | 2017-02-16 16:51:57 +0100 |
commit | 443250a9f74838116e0a8746f3c567fd5560f423 (patch) | |
tree | 882b22e953f1c3ec40a427b35df11f9ed824b8d5 /src/backends/native/meta-input-settings-native.c | |
parent | 1d24f612ccd56ff05648ea043f7cb91bb33bfa5f (diff) | |
download | mutter-443250a9f74838116e0a8746f3c567fd5560f423.tar.gz |
MetaInputSettings: allow edge scrolling without 2fg capable devices
We should only force edge scrolling off if two finger is enabled *and*
we actually have two finger capable devices.
https://bugzilla.gnome.org/show_bug.cgi?id=778554
Diffstat (limited to 'src/backends/native/meta-input-settings-native.c')
-rw-r--r-- | src/backends/native/meta-input-settings-native.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/backends/native/meta-input-settings-native.c b/src/backends/native/meta-input-settings-native.c index 266d224d9..6593e5d53 100644 --- a/src/backends/native/meta-input-settings-native.c +++ b/src/backends/native/meta-input-settings-native.c @@ -189,6 +189,19 @@ meta_input_settings_native_set_two_finger_scroll (MetaInputSettings * device_set_scroll_method (libinput_device, current | method); } +static gboolean +meta_input_settings_native_has_two_finger_scroll (MetaInputSettings *settings, + ClutterInputDevice *device) +{ + struct libinput_device *libinput_device; + + libinput_device = clutter_evdev_input_device_get_libinput_device (device); + if (!libinput_device) + return FALSE; + + return libinput_device_config_scroll_get_methods (libinput_device) & LIBINPUT_CONFIG_SCROLL_2FG; +} + static void meta_input_settings_native_set_scroll_button (MetaInputSettings *settings, ClutterInputDevice *device, @@ -418,6 +431,8 @@ meta_input_settings_native_class_init (MetaInputSettingsNativeClass *klass) input_settings_class->set_mouse_accel_profile = meta_input_settings_native_set_mouse_accel_profile; input_settings_class->set_trackball_accel_profile = meta_input_settings_native_set_trackball_accel_profile; + + input_settings_class->has_two_finger_scroll = meta_input_settings_native_has_two_finger_scroll; } static void |