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

gtkdnd: Reset widget controllers when starting DnD.

Browse Source 
Otherwise there's no full guarantees that this will happen.
This commit is contained in:
Carlos Garnacho 2016-01-13 20:54:43 +01:00
parent 2b703b61cf
commit 8d47617623
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk/gtkdnd.c
View File

@ -55,6 +55,7 @@
#include "gtkselectionprivate.h" #include "gtkselectionprivate.h"
#include "gtkwindowgroup.h" #include "gtkwindowgroup.h"
#include "gtkwindowprivate.h" #include "gtkwindowprivate.h"
#include "gtkwidgetprivate.h"
/** /**
@ -2308,6 +2309,8 @@ gtk_drag_begin_internal (GtkWidget *widget,
info->start_x = start_x; info->start_x = start_x;
info->start_y = start_y; info->start_y = start_y;
gtk_widget_reset_controllers (widget);
g_signal_emit_by_name (widget, "drag-begin", info->context); g_signal_emit_by_name (widget, "drag-begin", info->context);
/* Ensure that we have an icon before we start the drag; the /* Ensure that we have an icon before we start the drag; the
@ -2336,7 +2339,7 @@ gtk_drag_begin_internal (GtkWidget *widget,
G_CALLBACK (gtk_drag_context_dnd_finished_cb), info); G_CALLBACK (gtk_drag_context_dnd_finished_cb), info);
g_signal_connect (context, "cancel", g_signal_connect (context, "cancel",
G_CALLBACK (gtk_drag_context_cancel_cb), info); G_CALLBACK (gtk_drag_context_cancel_cb), info);
g_signal_connect (context, "action", g_signal_connect (context, "action-changed",
G_CALLBACK (gtk_drag_context_action_cb), info); G_CALLBACK (gtk_drag_context_action_cb), info);
selection = gdk_drag_get_selection (context); selection = gdk_drag_get_selection (context);