isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-24 09:00:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

MetaInputSettingsNative: allow unsetting click and scroll methods

Browse Source 
Checking for supported methods isn't needed since libinput will just
error out and do nothing itself if a requested method isn't supported
and, in fact, this logic was preventing the enum values 0 from being
set.

https://bugzilla.gnome.org/show_bug.cgi?id=771744
This commit is contained in:
Rui Matos 2016-10-27 19:08:08 +02:00
parent 6054b1cdbd
commit 1b4b361a92
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,28 +141,18 @@ static gboolean
device_set_scroll_method (struct libinput_device *libinput_device, device_set_scroll_method (struct libinput_device *libinput_device,
enum libinput_config_scroll_method method) enum libinput_config_scroll_method method)
{ {
enum libinput_config_scroll_method supported; enum libinput_config_status status =
supported = libinput_device_config_scroll_get_methods (libinput_device);
if (method & supported)
libinput_device_config_scroll_set_method (libinput_device, method); libinput_device_config_scroll_set_method (libinput_device, method);
return status == LIBINPUT_CONFIG_STATUS_SUCCESS;
return (method & supported) != 0;
} }
static gboolean static gboolean
device_set_click_method (struct libinput_device *libinput_device, device_set_click_method (struct libinput_device *libinput_device,
enum libinput_config_click_method method) enum libinput_config_click_method method)
{ {
enum libinput_config_click_method supported; enum libinput_config_status status =
supported = libinput_device_config_click_get_methods (libinput_device);
if (method & supported)
libinput_device_config_click_set_method (libinput_device, method); libinput_device_config_click_set_method (libinput_device, method);
return status == LIBINPUT_CONFIG_STATUS_SUCCESS;
return (method & supported) != 0;
} }
static void static void