sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

clutter/click-action: Move away from device IDs

Browse source 
Store the press device itself, not its ID.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1569>
This commit is contained in:
Carlos Garnacho 2020-11-17 14:39:59 +01:00 committed by Marge Bot
parent 32b68478ed
commit 287d9b6b6f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
clutter/clutter/clutter-click-action.c
View file

@ -114,7 +114,7 @@ struct _ClutterClickActionPrivate
gint drag_threshold; gint drag_threshold;
guint press_button; guint press_button;
gint press_device_id; ClutterInputDevice *press_device;
ClutterEventSequence *press_sequence; ClutterEventSequence *press_sequence;
ClutterModifierType modifier_state; ClutterModifierType modifier_state;
gfloat press_x; gfloat press_x;
@ -299,7 +299,7 @@ on_event (ClutterActor *actor,
return CLUTTER_EVENT_PROPAGATE; return CLUTTER_EVENT_PROPAGATE;
priv->press_button = has_button ? clutter_event_get_button (event) : 0; 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->press_sequence = clutter_event_get_event_sequence (event);
priv->modifier_state = clutter_event_get_state (event); priv->modifier_state = clutter_event_get_state (event);
clutter_event_get_coords (event, &priv->press_x, &priv->press_y); 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) || if ((has_button && clutter_event_get_button (event) != priv->press_button) ||
(has_button && clutter_event_get_click_count (event) != 1) || (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) clutter_event_get_event_sequence (event) != priv->press_sequence)
return CLUTTER_EVENT_PROPAGATE; return CLUTTER_EVENT_PROPAGATE;
@ -411,7 +411,7 @@ on_captured_event (ClutterActor *stage,
gfloat motion_x, motion_y; gfloat motion_x, motion_y;
gfloat delta_x, delta_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) clutter_event_get_event_sequence (event) != priv->press_sequence)
return CLUTTER_EVENT_PROPAGATE; return CLUTTER_EVENT_PROPAGATE;