summaryrefslogtreecommitdiff
path: root/gdk/macos/gdkmacosdisplay-translate.c
diff options
context:
space:
mode:
Diffstat (limited to 'gdk/macos/gdkmacosdisplay-translate.c')
-rw-r--r--gdk/macos/gdkmacosdisplay-translate.c34
1 files changed, 10 insertions, 24 deletions
diff --git a/gdk/macos/gdkmacosdisplay-translate.c b/gdk/macos/gdkmacosdisplay-translate.c
index 646ba0cd9e..db1cfa2527 100644
--- a/gdk/macos/gdkmacosdisplay-translate.c
+++ b/gdk/macos/gdkmacosdisplay-translate.c
@@ -678,31 +678,17 @@ fill_scroll_event (GdkMacosDisplay *self,
dy = 0.0;
}
- if (dx != 0.0 || dy != 0.0)
+ if ((dx != 0.0 || dy != 0.0) && ![nsevent hasPreciseScrollingDeltas])
{
- if ([nsevent hasPreciseScrollingDeltas])
- {
- GdkEvent *emulated;
-
- emulated = gdk_scroll_event_new_discrete (GDK_SURFACE (surface),
- pointer,
- NULL,
- get_time_from_ns_event (nsevent),
- state,
- direction,
- TRUE);
- _gdk_event_queue_append (GDK_DISPLAY (self), emulated);
- }
- else
- {
- ret = gdk_scroll_event_new_discrete (GDK_SURFACE (surface),
- pointer,
- NULL,
- get_time_from_ns_event (nsevent),
- state,
- direction,
- FALSE);
- }
+ g_assert (ret == NULL);
+
+ ret = gdk_scroll_event_new_discrete (GDK_SURFACE (surface),
+ pointer,
+ NULL,
+ get_time_from_ns_event (nsevent),
+ state,
+ direction,
+ FALSE);
}
if (phase == NSEventPhaseEnded || phase == NSEventPhaseCancelled)