diff options
author | Carlos Garnacho <carlosg@gnome.org> | 2020-11-17 14:39:59 +0100 |
---|---|---|
committer | Marge Bot <marge-bot@gnome.org> | 2020-11-18 19:10:48 +0000 |
commit | 287d9b6b6fce292c633140f65f3e30005313eff5 (patch) | |
tree | 9f826adea8d0f76aeccbea8d8afe856c9106b155 | |
parent | 32b68478ede34caee447c9803addedc12a4df6c7 (diff) | |
download | mutter-287d9b6b6fce292c633140f65f3e30005313eff5.tar.gz |
clutter/click-action: Move away from device IDs
Store the press device itself, not its ID.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1569>
-rw-r--r-- | clutter/clutter/clutter-click-action.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clutter/clutter/clutter-click-action.c b/clutter/clutter/clutter-click-action.c index 6bc977a84..570d86dfb 100644 --- a/clutter/clutter/clutter-click-action.c +++ b/clutter/clutter/clutter-click-action.c @@ -114,7 +114,7 @@ struct _ClutterClickActionPrivate gint drag_threshold; guint press_button; - gint press_device_id; + ClutterInputDevice *press_device; ClutterEventSequence *press_sequence; ClutterModifierType modifier_state; gfloat press_x; @@ -299,7 +299,7 @@ on_event (ClutterActor *actor, return CLUTTER_EVENT_PROPAGATE; priv->press_button = has_button ? clutter_event_get_button (event) : 0; - priv->press_device_id = clutter_event_get_device_id (event); + priv->press_device = clutter_event_get_device (event); priv->press_sequence = clutter_event_get_event_sequence (event); priv->modifier_state = clutter_event_get_state (event); clutter_event_get_coords (event, &priv->press_x, &priv->press_y); @@ -370,7 +370,7 @@ on_captured_event (ClutterActor *stage, if ((has_button && clutter_event_get_button (event) != priv->press_button) || (has_button && clutter_event_get_click_count (event) != 1) || - clutter_event_get_device_id (event) != priv->press_device_id || + clutter_event_get_device (event) != priv->press_device || clutter_event_get_event_sequence (event) != priv->press_sequence) return CLUTTER_EVENT_PROPAGATE; @@ -411,7 +411,7 @@ on_captured_event (ClutterActor *stage, gfloat motion_x, motion_y; gfloat delta_x, delta_y; - if (clutter_event_get_device_id (event) != priv->press_device_id || + if (clutter_event_get_device (event) != priv->press_device || clutter_event_get_event_sequence (event) != priv->press_sequence) return CLUTTER_EVENT_PROPAGATE; |