From f0b758b891260d385f8d06e89482fd27db15d76a Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Fri, 30 Jun 2017 11:45:48 +0200 Subject: [PATCH] backends: Apply tablet settings on all tablet device types during startup This skipped the device types that are in use on X11. https://bugzilla.gnome.org/show_bug.cgi?id=782027 --- src/backends/meta-input-settings.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/backends/meta-input-settings.c b/src/backends/meta-input-settings.c index 05c3ceb2d..6c5f261e9 100644 --- a/src/backends/meta-input-settings.c +++ b/src/backends/meta-input-settings.c @@ -1075,10 +1075,15 @@ static void apply_mappable_device_settings (MetaInputSettings *input_settings, DeviceMappingInfo *info) { - update_device_display (input_settings, info->settings, info->device); + ClutterInputDeviceType device_type; - if (clutter_input_device_get_device_type (info->device) == CLUTTER_TABLET_DEVICE || - clutter_input_device_get_device_type (info->device) == CLUTTER_PAD_DEVICE) + update_device_display (input_settings, info->settings, info->device); + device_type = clutter_input_device_get_device_type (info->device); + + if (device_type == CLUTTER_TABLET_DEVICE || + device_type == CLUTTER_PEN_DEVICE || + device_type == CLUTTER_ERASER_DEVICE || + device_type == CLUTTER_PAD_DEVICE) { update_tablet_mapping (input_settings, info->settings, info->device); update_tablet_area (input_settings, info->settings, info->device);