From c1fc359e76827307e6aef1154edef70f3f6eba83 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Thu, 17 Aug 2023 14:26:29 +0200
Subject: [PATCH] clutter: Move scroll deltas from ClutterEventPrivate to
 scroll event

This can now be done without API/ABI concerns.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3190>
---
 clutter/clutter/clutter-event.c | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/clutter/clutter/clutter-event.c b/clutter/clutter/clutter-event.c
index 2709dc172..a692573be 100644
--- a/clutter/clutter/clutter-event.c
+++ b/clutter/clutter/clutter-event.c
@@ -121,6 +121,8 @@ struct _ClutterScrollEvent
 
   float x;
   float y;
+  double delta_x;
+  double delta_y;
   ClutterScrollDirection direction;
   ClutterModifierType modifier_state;
   double *axes; /* future use */
@@ -280,9 +282,6 @@ typedef struct _ClutterEventPrivate {
   ClutterInputDevice *device;
   ClutterInputDevice *source_device;
 
-  gdouble delta_x;
-  gdouble delta_y;
-
   ClutterInputDeviceTool *tool;
 } ClutterEventPrivate;
 
@@ -567,20 +566,15 @@ clutter_event_get_scroll_delta (const ClutterEvent *event,
                                 gdouble            *dx,
                                 gdouble            *dy)
 {
-  gdouble delta_x, delta_y;
-
   g_return_if_fail (event != NULL);
   g_return_if_fail (event->type == CLUTTER_SCROLL);
   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)
-    *dx = delta_x;
+    *dx = event->scroll.delta_x;
 
   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->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;
 
   switch (event->type)
@@ -2063,6 +2055,8 @@ clutter_event_scroll_smooth_new (ClutterEventFlags         flags,
   event->scroll.flags = flags;
   event->scroll.x = coords.x;
   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.modifier_state = modifiers;
   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);
   private->tool = tool;
-  private->delta_x = delta.x;
-  private->delta_y = delta.y;
 
   if (tool)
     {