isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-07-28 04:29:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

MetaInputSettings: allow edge scrolling without 2fg capable devices

Browse Source 
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
This commit is contained in:
Rui Matos
2017-02-13 14:06:35 +01:00
parent 191525cdb4
commit 90923903ae
4 changed files with 75 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/backends/native/meta-input-settings-native.c
View File

@@ -188,6 +188,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,
@@ -503,6 +516,8 @@ meta_input_settings_native_class_init (MetaInputSettingsNativeClass *klass)
input_settings_class->set_stylus_pressure = meta_input_settings_native_set_stylus_pressure;
input_settings_class->set_stylus_button_map = meta_input_settings_native_set_stylus_button_map;
input_settings_class->has_two_finger_scroll = meta_input_settings_native_has_two_finger_scroll;
}
static void