From c4d11f755038170eaab7ecf15363c9515a9718ea Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Wed, 6 May 2020 20:20:49 +0200
Subject: [PATCH] backends: Fold device mapping check into backend

Make the upper part agnostic about the device being relative in order
to avoid applying keep-aspect. The X11 bits already are, so make it
sure it's also the case for the native backend.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1486
---
 src/backends/meta-input-settings.c               | 14 +++-----------
 src/backends/native/meta-input-settings-native.c |  4 ++++
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/backends/meta-input-settings.c b/src/backends/meta-input-settings.c
index 272e77b67..045df81de 100644
--- a/src/backends/meta-input-settings.c
+++ b/src/backends/meta-input-settings.c
@@ -1054,17 +1054,9 @@ update_tablet_keep_aspect (MetaInputSettings  *input_settings,
 
   input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
 
-  if (clutter_input_device_get_mapping_mode (device) ==
-      CLUTTER_INPUT_DEVICE_MAPPING_ABSOLUTE)
-    {
-      keep_aspect = g_settings_get_boolean (settings, "keep-aspect");
-      meta_input_settings_find_monitor (input_settings, settings, device,
-                                        NULL, &logical_monitor);
-    }
-  else
-    {
-      keep_aspect = FALSE;
-    }
+  keep_aspect = g_settings_get_boolean (settings, "keep-aspect");
+  meta_input_settings_find_monitor (input_settings, settings, device,
+                                    NULL, &logical_monitor);
 
   input_settings_class->set_tablet_keep_aspect (input_settings, device,
                                                 logical_monitor, keep_aspect);
diff --git a/src/backends/native/meta-input-settings-native.c b/src/backends/native/meta-input-settings-native.c
index 417481c19..6f4ff6ba7 100644
--- a/src/backends/native/meta-input-settings-native.c
+++ b/src/backends/native/meta-input-settings-native.c
@@ -545,6 +545,10 @@ meta_input_settings_native_set_tablet_keep_aspect (MetaInputSettings  *settings,
 {
   double aspect_ratio = 0;
 
+  if (clutter_input_device_get_mapping_mode (device) ==
+      CLUTTER_INPUT_DEVICE_MAPPING_RELATIVE)
+    keep_aspect = FALSE;
+
   if (keep_aspect)
     {
       int width, height;