[mutter/wip/rstrode/rhel-8.0.0: 114/117] clutter: Only reset scroll axes on slave devices
- From: Ray Strode <halfline src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/rstrode/rhel-8.0.0: 114/117] clutter: Only reset scroll axes on slave devices
- Date: Sun, 17 Feb 2019 17:32:25 +0000 (UTC)
commit 0dccf69cb3abfbd742d0102728a5662d905632ce
Author: Carlos Garnacho <carlosg gnome org>
Date: Wed Jun 13 13:48:24 2018 +0200
clutter: Only reset scroll axes on slave devices
As a plus, unknown source device IDs will just warn instead of crash.
clutter/clutter/x11/clutter-device-manager-xi2.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/clutter/clutter/x11/clutter-device-manager-xi2.c
b/clutter/clutter/x11/clutter-device-manager-xi2.c
index 6794a2e0c..0718cd975 100644
--- a/clutter/clutter/x11/clutter-device-manager-xi2.c
+++ b/clutter/clutter/x11/clutter-device-manager-xi2.c
@@ -1819,7 +1819,8 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
_clutter_input_device_set_stage (device, NULL);
}
- _clutter_input_device_reset_scroll_info (source_device);
+ if (clutter_input_device_get_device_mode (source_device) == CLUTTER_INPUT_MODE_SLAVE)
+ _clutter_input_device_reset_scroll_info (source_device);
clutter_event_set_device (event, device);
clutter_event_set_source_device (event, source_device);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]