AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

DND: go back to a timeout for cancel animation

Browse Source 
Using a tick callback does not really make sense here, since we
are not drawing in a window, but moving a toplevel around.
https://bugzilla.gnome.org/show_bug.cgi?id=728183
This commit is contained in:
Matthias Clasen 2014-04-14 17:10:25 -07:00
parent d871105fa8
commit aab1610d40
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtkdnd.c
View File

@ -256,9 +256,7 @@ static void gtk_drag_selection_get (GtkWidget *widget,
guint32 time,
gpointer data);
static void gtk_drag_anim_destroy (GtkDragAnim *anim);
static gboolean gtk_drag_anim_tick (GtkWidget *widget,
GdkFrameClock *frame_clock,
gpointer data);
static gboolean gtk_drag_anim_timeout (gpointer data);
static void gtk_drag_remove_icon (GtkDragSourceInfo *info);
static void gtk_drag_source_info_destroy (GtkDragSourceInfo *info);
static void gtk_drag_add_update_idle (GtkDragSourceInfo *info);
@ -3807,7 +3805,7 @@ gtk_drag_drop_finished (GtkDragSourceInfo *info,
* to respond really late, we still are OK.
*/
gtk_drag_clear_source_info (info->context);
gtk_widget_add_tick_callback (info->widget, gtk_drag_anim_tick, anim, (GDestroyNotify) gtk_drag_anim_destroy);
gdk_threads_add_timeout_full (G_PRIORITY_DEFAULT, 17, gtk_drag_anim_timeout, anim, (GDestroyNotify) gtk_drag_anim_destroy);
}
}
}
@ -4038,13 +4036,13 @@ gtk_drag_anim_destroy (GtkDragAnim *anim)
}
static gboolean
gtk_drag_anim_tick (GtkWidget *widget,
GdkFrameClock *frame_clock,
gpointer data)
gtk_drag_anim_timeout (gpointer data)
{
GtkWidget *icon_window;
GtkDragAnim *anim = data;
GtkDragSourceInfo *info = anim->info;
GtkWidget *widget = info->widget;
GdkFrameClock *frame_clock = gtk_widget_get_frame_clock (widget);
gint64 current_time = gdk_frame_clock_get_frame_time (frame_clock);
int hot_x, hot_y;
double f = (current_time - anim->start_time) / (double) ANIM_TIME;