summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Garnacho <carlosg@gnome.org>2022-12-16 23:06:33 +0100
committerRobert Mader <robert.mader@collabora.com>2023-01-06 13:51:30 +0100
commit933c9937f4fec0b54bf8e73033f9126f18d434e6 (patch)
tree42b83fadc9e8f31aa899febcc15627a5b03ac23b
parent01969a77ee33519dbd6159393eb43ee40e040cda (diff)
downloadmutter-933c9937f4fec0b54bf8e73033f9126f18d434e6.tar.gz
backends: Only apply EDID-based tablet mapping heuristic on integrated devices
These are the ones attached to a display, thus they are the ones that may need help from this heuristic. Non-integrated tablets (e.g. Intuos) will default to the span of all monitors. Fixes mapping of opaque tablets if a display-integrated tablet of the same brand is also plugged in. Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2767> (cherry picked from commit ba25271408a32a2a73a82acc6e094a611001c9f0)
-rw-r--r--src/backends/meta-input-mapper.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/backends/meta-input-mapper.c b/src/backends/meta-input-mapper.c
index 56da701b8..c5a9ee318 100644
--- a/src/backends/meta-input-mapper.c
+++ b/src/backends/meta-input-mapper.c
@@ -493,7 +493,7 @@ guess_candidates (MetaInputMapper *mapper,
g_assert (META_IS_MONITOR (l->data));
- if (match_edid (input, l->data, &edid_match))
+ if (integrated && match_edid (input, l->data, &edid_match))
match.score |= 1 << edid_match;
if (integrated && match_size (input, l->data))