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

backends: Do not prevent mapping/keep-aspect changes on integrated tablets

Browse Source 
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: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3012>
This commit is contained in:
Carlos Garnacho 2023-05-19 16:24:31 +02:00 committed by Marge Bot
parent ee412cc4a3
commit 8c0809995a
1 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1026,19 +1026,6 @@ update_tablet_keep_aspect (MetaInputSettings *input_settings,
if (!info) if (!info)
return; 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"); keep_aspect = g_settings_get_boolean (settings, "keep-aspect");
if (keep_aspect) if (keep_aspect)
@ -1062,19 +1049,6 @@ update_tablet_mapping (MetaInputSettings *input_settings,
CLUTTER_INPUT_CAPABILITY_TABLET_TOOL) == 0) CLUTTER_INPUT_CAPABILITY_TABLET_TOOL) == 0)
return; 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); input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
mapping = g_settings_get_enum (settings, "mapping"); mapping = g_settings_get_enum (settings, "mapping");