mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-11-05 16:20:10 +00:00
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.
This commit is contained in:
parent
46afb008db
commit
646d68e4bd
11
ChangeLog
11
ChangeLog
@ -1,3 +1,14 @@
|
||||
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.
|
||||
|
||||
Thu Dec 3 16:37:42 1998 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkclist.c (get_cell_style): Use GTK_STATE_INSENSITIVE
|
||||
|
@ -1,3 +1,14 @@
|
||||
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.
|
||||
|
||||
Thu Dec 3 16:37:42 1998 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkclist.c (get_cell_style): Use GTK_STATE_INSENSITIVE
|
||||
|
@ -1,3 +1,14 @@
|
||||
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.
|
||||
|
||||
Thu Dec 3 16:37:42 1998 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkclist.c (get_cell_style): Use GTK_STATE_INSENSITIVE
|
||||
|
@ -1,3 +1,14 @@
|
||||
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.
|
||||
|
||||
Thu Dec 3 16:37:42 1998 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkclist.c (get_cell_style): Use GTK_STATE_INSENSITIVE
|
||||
|
@ -1,3 +1,14 @@
|
||||
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.
|
||||
|
||||
Thu Dec 3 16:37:42 1998 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkclist.c (get_cell_style): Use GTK_STATE_INSENSITIVE
|
||||
|
@ -1,3 +1,14 @@
|
||||
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.
|
||||
|
||||
Thu Dec 3 16:37:42 1998 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkclist.c (get_cell_style): Use GTK_STATE_INSENSITIVE
|
||||
|
@ -1,3 +1,14 @@
|
||||
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.
|
||||
|
||||
Thu Dec 3 16:37:42 1998 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkclist.c (get_cell_style): Use GTK_STATE_INSENSITIVE
|
||||
|
10
gtk/gtkdnd.c
10
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,
|
||||
|
Loading…
Reference in New Issue
Block a user