From 8c0809995a97dcd93c54b570ceb413befe0180c6 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Fri, 19 May 2023 16:24:31 +0200 Subject: [PATCH] backends: Do not prevent mapping/keep-aspect changes on integrated tablets We do in fact allow these combinations of configuration since the Settings Wacom panel revamp. We no longer need to look up Wacom device features, since this is allowed for all the devices that have these settings. Part-of: --- src/backends/meta-input-settings.c | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/src/backends/meta-input-settings.c b/src/backends/meta-input-settings.c index 9c2c674b3..516f42fd8 100644 --- a/src/backends/meta-input-settings.c +++ b/src/backends/meta-input-settings.c @@ -1026,19 +1026,6 @@ update_tablet_keep_aspect (MetaInputSettings *input_settings, if (!info) return; -#ifdef HAVE_LIBWACOM - { - WacomDevice *wacom_device; - - wacom_device = meta_input_device_get_wacom_device (META_INPUT_DEVICE (device)); - - /* Keep aspect only makes sense in external tablets */ - if (wacom_device && - libwacom_get_integration_flags (wacom_device) != WACOM_DEVICE_INTEGRATED_NONE) - return; - } -#endif - keep_aspect = g_settings_get_boolean (settings, "keep-aspect"); if (keep_aspect) @@ -1062,19 +1049,6 @@ update_tablet_mapping (MetaInputSettings *input_settings, CLUTTER_INPUT_CAPABILITY_TABLET_TOOL) == 0) return; -#ifdef HAVE_LIBWACOM - { - WacomDevice *wacom_device; - - wacom_device = meta_input_device_get_wacom_device (META_INPUT_DEVICE (device)); - - /* Tablet mapping only makes sense on external tablets */ - if (wacom_device && - (libwacom_get_integration_flags (wacom_device) != WACOM_DEVICE_INTEGRATED_NONE)) - return; - } -#endif - input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings); mapping = g_settings_get_enum (settings, "mapping");