From ddfd42fbb31c8389fb83768970884b97228bfedd Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 13 Jun 2002 15:56:20 +0000 Subject: [PATCH] Save the initial grab time, use that when changing the pointer. (#83052, Thu Jun 13 11:36:37 2002 Owen Taylor * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Save the initial grab time, use that when changing the pointer. (#83052, help from Dave Camp tracking it down.) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkdnd.c | 4 +++- 7 files changed, 39 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6012ab2643..edae386b8b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Jun 13 11:36:37 2002 Owen Taylor + + * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Save + the initial grab time, use that when changing the + pointer. (#83052, help from Dave Camp tracking it down.) + Thu Jun 13 16:42:40 2002 Kristian Rietveld * gtk/gtktreestore.c (gtk_tree_store_finalize): traverse all nodes, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6012ab2643..edae386b8b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Thu Jun 13 11:36:37 2002 Owen Taylor + + * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Save + the initial grab time, use that when changing the + pointer. (#83052, help from Dave Camp tracking it down.) + Thu Jun 13 16:42:40 2002 Kristian Rietveld * gtk/gtktreestore.c (gtk_tree_store_finalize): traverse all nodes, diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 6012ab2643..edae386b8b 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Thu Jun 13 11:36:37 2002 Owen Taylor + + * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Save + the initial grab time, use that when changing the + pointer. (#83052, help from Dave Camp tracking it down.) + Thu Jun 13 16:42:40 2002 Kristian Rietveld * gtk/gtktreestore.c (gtk_tree_store_finalize): traverse all nodes, diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 6012ab2643..edae386b8b 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Thu Jun 13 11:36:37 2002 Owen Taylor + + * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Save + the initial grab time, use that when changing the + pointer. (#83052, help from Dave Camp tracking it down.) + Thu Jun 13 16:42:40 2002 Kristian Rietveld * gtk/gtktreestore.c (gtk_tree_store_finalize): traverse all nodes, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 6012ab2643..edae386b8b 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Thu Jun 13 11:36:37 2002 Owen Taylor + + * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Save + the initial grab time, use that when changing the + pointer. (#83052, help from Dave Camp tracking it down.) + Thu Jun 13 16:42:40 2002 Kristian Rietveld * gtk/gtktreestore.c (gtk_tree_store_finalize): traverse all nodes, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6012ab2643..edae386b8b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Thu Jun 13 11:36:37 2002 Owen Taylor + + * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Save + the initial grab time, use that when changing the + pointer. (#83052, help from Dave Camp tracking it down.) + Thu Jun 13 16:42:40 2002 Kristian Rietveld * gtk/gtktreestore.c (gtk_tree_store_finalize): traverse all nodes, diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index 91949373ad..09af044ad8 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -94,6 +94,7 @@ struct _GtkDragSourceInfo gint start_x, start_y; /* Initial position */ gint cur_x, cur_y; /* Current Position */ + guint32 grab_time; /* timestamp for initial grab */ GList *selections; /* selections we've claimed */ GtkDragDestInfo *proxy_dest; /* Set if this is a proxy drag */ @@ -1903,6 +1904,7 @@ gtk_drag_begin (GtkWidget *widget, } info->have_grab = TRUE; + info->grab_time = time; return info->context; } @@ -2474,7 +2476,7 @@ _gtk_drag_source_handle_event (GtkWidget *widget, GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_RELEASE_MASK, NULL, - cursor, event->dnd.time); + cursor, info->grab_time); info->cursor = cursor; }