diff options
| author | Owen Taylor <otaylor@redhat.com> | 1998-12-03 21:50:20 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 1998-12-03 21:50:20 +0000 |
| commit | 646d68e4bd3e2867f82491904e1978fb64600584 (patch) | |
| tree | 3f3d443338b5428c85ab62a19fcca809d2d2ec95 /gtk/gtkdnd.c | |
| parent | 46afb008dbf7ca274e2c6fc96cc6203bc5ee38e3 (diff) | |
| download | gdk-pixbuf-646d68e4bd3e2867f82491904e1978fb64600584.tar.gz | |
Changed to 5 min from 10 seconds, so it doesn't abort while users have an
Thu Dec 3 16:49:18 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkdnd.c (DROP_ABORT_TIME): Changed to 5 min
from 10 seconds, so it doesn't abort while users
have an ACTION_ASK menu up.
* gtk/gtkdnd.c: Hide the icon window between sending a a
drop event to the destination and displaying the
snapback animation, so that it doesn't hang around
during ACTION_ASK.
Diffstat (limited to 'gtk/gtkdnd.c')
| -rw-r--r-- | gtk/gtkdnd.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index cecf799ef..052c671b7 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -103,7 +103,7 @@ struct _GtkDragDestInfo { gint drop_x, drop_y; /* Position of drop */ }; -#define DROP_ABORT_TIME 10000 +#define DROP_ABORT_TIME 300000 #define ANIM_STEP_TIME 50 #define ANIM_STEP_LENGTH 50 @@ -1997,6 +1997,11 @@ gtk_drag_drop_finished (GtkDragSourceInfo *info, anim->n_steps = MAX (info->cur_x - info->start_x, info->cur_y - info->start_y) / ANIM_STEP_LENGTH; anim->n_steps = CLAMP (anim->n_steps, ANIM_MIN_STEPS, ANIM_MAX_STEPS); + if (info->icon_window) + { + gtk_widget_show(info->icon_window); + gdk_window_raise (info->icon_window->window); + } gtk_timeout_add (ANIM_STEP_TIME, gtk_drag_anim_timeout, anim); } @@ -2066,6 +2071,9 @@ gtk_drag_drop (GtkDragSourceInfo *info, guint32 time) } else { + if (info->icon_window) + gtk_widget_hide (info->icon_window); + gdk_drag_drop (info->context, time); info->drop_timeout = gtk_timeout_add (DROP_ABORT_TIME, gtk_drag_abort_timeout, |