isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-28 13:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

clutter: Move scroll deltas from ClutterEventPrivate to scroll event

Browse Source 
This can now be done without API/ABI concerns.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3190>
This commit is contained in:
Carlos Garnacho 2023-08-17 14:26:29 +02:00 committed by Marge Bot
parent 7ab1a7111e
commit c1fc359e76
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
clutter/clutter/clutter-event.c
View File

@ -121,6 +121,8 @@ struct _ClutterScrollEvent
float x; float x;
float y; float y;
double delta_x;
double delta_y;
ClutterScrollDirection direction; ClutterScrollDirection direction;
ClutterModifierType modifier_state; ClutterModifierType modifier_state;
double *axes; /* future use */ double *axes; /* future use */
@ -280,9 +282,6 @@ typedef struct _ClutterEventPrivate {
ClutterInputDevice *device; ClutterInputDevice *device;
ClutterInputDevice *source_device; ClutterInputDevice *source_device;
gdouble delta_x;
gdouble delta_y;
ClutterInputDeviceTool *tool; ClutterInputDeviceTool *tool;
} ClutterEventPrivate; } ClutterEventPrivate;
@ -567,20 +566,15 @@ clutter_event_get_scroll_delta (const ClutterEvent *event,
gdouble *dx, gdouble *dx,
gdouble *dy) gdouble *dy)
{ {
gdouble delta_x, delta_y;
g_return_if_fail (event != NULL); g_return_if_fail (event != NULL);
g_return_if_fail (event->type == CLUTTER_SCROLL); g_return_if_fail (event->type == CLUTTER_SCROLL);
g_return_if_fail (event->scroll.direction == CLUTTER_SCROLL_SMOOTH); g_return_if_fail (event->scroll.direction == CLUTTER_SCROLL_SMOOTH);
delta_x = ((ClutterEventPrivate *) event)->delta_x;
delta_y = ((ClutterEventPrivate *) event)->delta_y;
if (dx != NULL) if (dx != NULL)
*dx = delta_x; *dx = event->scroll.delta_x;
if (dy != NULL) if (dy != NULL)
*dy = delta_y; *dy = event->scroll.delta_y;
} }
/** /**
@ -899,8 +893,6 @@ clutter_event_copy (const ClutterEvent *event)
g_set_object (&new_real_event->device, real_event->device); g_set_object (&new_real_event->device, real_event->device);
g_set_object (&new_real_event->source_device, real_event->source_device); g_set_object (&new_real_event->source_device, real_event->source_device);
new_real_event->delta_x = real_event->delta_x;
new_real_event->delta_y = real_event->delta_y;
new_real_event->tool = real_event->tool; new_real_event->tool = real_event->tool;
switch (event->type) switch (event->type)
@ -2063,6 +2055,8 @@ clutter_event_scroll_smooth_new (ClutterEventFlags flags,
event->scroll.flags = flags; event->scroll.flags = flags;
event->scroll.x = coords.x; event->scroll.x = coords.x;
event->scroll.y = coords.y; event->scroll.y = coords.y;
event->scroll.delta_x = delta.x;
event->scroll.delta_y = delta.y;
event->scroll.direction = CLUTTER_SCROLL_SMOOTH; event->scroll.direction = CLUTTER_SCROLL_SMOOTH;
event->scroll.modifier_state = modifiers; event->scroll.modifier_state = modifiers;
event->scroll.scroll_source = scroll_source; event->scroll.scroll_source = scroll_source;
@ -2070,8 +2064,6 @@ clutter_event_scroll_smooth_new (ClutterEventFlags flags,
g_set_object (&private->source_device, source_device); g_set_object (&private->source_device, source_device);
private->tool = tool; private->tool = tool;
private->delta_x = delta.x;
private->delta_y = delta.y;
if (tool) if (tool)
{ {