From e6349c940e5c2196fd683ca5237949449c5580c8 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Fri, 25 Aug 2017 16:51:12 +0200 Subject: [PATCH] paned: Update to using GdkEvent API --- gtk/gtkpaned.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c index 6bbc58b18e..da21bc138b 100644 --- a/gtk/gtkpaned.c +++ b/gtk/gtkpaned.c @@ -312,12 +312,14 @@ gtk_paned_motion_notify (GtkWidget *widget, GtkPanedPrivate *priv = gtk_paned_get_instance_private (paned); GdkRectangle handle_area; GdkDisplay *display; + gdouble x, y; get_handle_area (paned, &handle_area); display = gtk_widget_get_display (widget); - if (gdk_rectangle_contains_point (&handle_area, event->x, event->y) || - priv->panning) + if (gdk_event_get_coords ((GdkEvent *) event, &x, &y) && + (gdk_rectangle_contains_point (&handle_area, x, y) || + priv->panning)) { GdkCursor *cursor; @@ -765,7 +767,7 @@ gesture_drag_begin_cb (GtkGestureDrag *gesture, device = gdk_event_get_source_device (event); priv->panning = FALSE; - is_touch = (event->type == GDK_TOUCH_BEGIN || + is_touch = (gdk_event_get_event_type (event) == GDK_TOUCH_BEGIN || gdk_device_get_source (device) == GDK_SOURCE_TOUCHSCREEN); get_handle_area (paned, &handle_area);