brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backends: Fix configuration changes to tap[-and-drag]

Browse Source 
Most people just see a harmless warning when applying this setting to
all touchpads (which this patch fixes). But tap[-and-drag] is supposed
to remain enabled for display-less Wacom tablets, despite configuration
changes.

Fix this by using the mapping function, so the setting is forced on for
wacom devices. This happens on a per-device basis, so the warning is
gone too.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1145
This commit is contained in:
Carlos Garnacho 2020-03-24 13:16:11 +01:00 committed by Carlos Garnacho
parent 18b661cc93
commit ec1195e3ff
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/backends/meta-input-settings.c
View File

@ -592,6 +592,14 @@ device_is_tablet_touchpad (MetaInputSettings *input_settings,
return FALSE; return FALSE;
} }
static gboolean
force_enable_on_tablet (MetaInputSettings *input_settings,
ClutterInputDevice *device,
gboolean value)
{
return device_is_tablet_touchpad (input_settings, device) || value;
}
static void static void
update_touchpad_tap_enabled (MetaInputSettings *input_settings, update_touchpad_tap_enabled (MetaInputSettings *input_settings,
ClutterInputDevice *device) ClutterInputDevice *device)
@ -606,18 +614,19 @@ update_touchpad_tap_enabled (MetaInputSettings *input_settings,
priv = meta_input_settings_get_instance_private (input_settings); priv = meta_input_settings_get_instance_private (input_settings);
input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings); input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
enabled = device_is_tablet_touchpad (input_settings, device) || enabled = g_settings_get_boolean (priv->touchpad_settings, "tap-to-click");
g_settings_get_boolean (priv->touchpad_settings, "tap-to-click");
if (device) if (device)
{ {
enabled = force_enable_on_tablet (input_settings, device, enabled);
settings_device_set_bool_setting (input_settings, device, settings_device_set_bool_setting (input_settings, device,
input_settings_class->set_tap_enabled, input_settings_class->set_tap_enabled,
enabled); enabled);
} }
else else
{ {
settings_set_bool_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE, NULL, settings_set_bool_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE,
force_enable_on_tablet,
input_settings_class->set_tap_enabled, input_settings_class->set_tap_enabled,
enabled); enabled);
} }
@ -637,18 +646,19 @@ update_touchpad_tap_and_drag_enabled (MetaInputSettings *input_settings,
priv = meta_input_settings_get_instance_private (input_settings); priv = meta_input_settings_get_instance_private (input_settings);
input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings); input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
enabled = device_is_tablet_touchpad (input_settings, device) || enabled = g_settings_get_boolean (priv->touchpad_settings, "tap-and-drag");
g_settings_get_boolean (priv->touchpad_settings, "tap-and-drag");
if (device) if (device)
{ {
enabled = force_enable_on_tablet (input_settings, device, enabled);
settings_device_set_bool_setting (input_settings, device, settings_device_set_bool_setting (input_settings, device,
input_settings_class->set_tap_and_drag_enabled, input_settings_class->set_tap_and_drag_enabled,
enabled); enabled);
} }
else else
{ {
settings_set_bool_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE, NULL, settings_set_bool_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE,
force_enable_on_tablet,
input_settings_class->set_tap_and_drag_enabled, input_settings_class->set_tap_and_drag_enabled,
enabled); enabled);
} }