dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

close the popup when a drag starts. 

2006-10-15  Michael Natterer  <mitch@gimp.org>

	* app/widgets/gimpview-popup.c: close the popup when a drag starts.
This commit is contained in:
Michael Natterer 2006-10-15 17:35:38 +00:00 committed by Michael Natterer
parent 28ab5de527
commit 33720907ef
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2006-10-15 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpview-popup.c: close the popup when a drag starts.
2006-10-15 Michael Natterer <mitch@gimp.org>
Applied slightly modified patch from Martin Nordholts which

17
app/widgets/gimpview-popup.c
View File

@ -66,6 +66,9 @@ static gboolean gimp_view_popup_button_release (GtkWidget *widget,
GimpViewPopup *popup);
static void gimp_view_popup_unmap (GtkWidget *widget,
GimpViewPopup *popup);
static void gimp_view_popup_drag_begin (GtkWidget *widget,
GdkDragContext *context,
GimpViewPopup *popup);
static gboolean gimp_view_popup_timeout (GimpViewPopup *popup);
@ -121,6 +124,9 @@ gimp_view_popup_show (GtkWidget *widget,
g_signal_connect (widget, "unmap",
G_CALLBACK (gimp_view_popup_unmap),
popup);
g_signal_connect (widget, "drag-begin",
G_CALLBACK (gimp_view_popup_drag_begin),
popup);
popup->timeout_id = g_timeout_add (VIEW_POPUP_DELAY,
(GSourceFunc) gimp_view_popup_timeout,
@ -152,6 +158,9 @@ gimp_view_popup_hide (GimpViewPopup *popup)
g_signal_handlers_disconnect_by_func (popup->widget,
gimp_view_popup_unmap,
popup);
g_signal_handlers_disconnect_by_func (popup->widget,
gimp_view_popup_drag_begin,
popup);
gtk_grab_remove (popup->widget);
@ -176,6 +185,14 @@ gimp_view_popup_unmap (GtkWidget *widget,
g_object_set_data (G_OBJECT (popup->widget), "gimp-view-popup", NULL);
}
static void
gimp_view_popup_drag_begin (GtkWidget *widget,
GdkDragContext *context,
GimpViewPopup *popup)
{
g_object_set_data (G_OBJECT (popup->widget), "gimp-view-popup", NULL);
}
static gboolean
gimp_view_popup_timeout (GimpViewPopup *popup)
{