AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-29 15:01:23 +00:00
Code Issues Projects Releases Wiki Activity

dragsource: Use public drag icon api

Browse Source
This commit is contained in:
Matthias Clasen 2020-01-06 16:00:17 -05:00
parent 78832c65b5
commit 8c73f882af
1 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gtk/gtkdragsource.c
View File

@ -37,6 +37,8 @@
#include "gtkdragiconprivate.h" #include "gtkdragiconprivate.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkicontheme.h"
#include "gtkpicture.h"
#include "gtksettingsprivate.h" #include "gtksettingsprivate.h"
/** /**
@ -81,7 +83,6 @@ struct _GtkDragSource
GdkContentProvider *content; GdkContentProvider *content;
GdkDragAction actions; GdkDragAction actions;
GtkWidget *icon_window;
GdkPaintable *paintable; GdkPaintable *paintable;
int hot_x; int hot_x;
int hot_y; int hot_y;
@ -118,8 +119,6 @@ static guint signals[NUM_SIGNALS];
static void gtk_drag_source_dnd_finished_cb (GdkDrag *drag, static void gtk_drag_source_dnd_finished_cb (GdkDrag *drag,
GtkDragSource *source); GtkDragSource *source);
static void gtk_drag_source_drop_performed_cb (GdkDrag *drag,
GtkDragSource *source);
static void gtk_drag_source_cancel_cb (GdkDrag *drag, static void gtk_drag_source_cancel_cb (GdkDrag *drag,
GdkDragCancelReason reason, GdkDragCancelReason reason,
GtkDragSource *source); GtkDragSource *source);
@ -142,7 +141,6 @@ gtk_drag_source_finalize (GObject *object)
g_clear_object (&source->content); g_clear_object (&source->content);
g_clear_object (&source->paintable); g_clear_object (&source->paintable);
g_clear_object (&source->icon_window);
G_OBJECT_CLASS (gtk_drag_source_parent_class)->finalize (object); G_OBJECT_CLASS (gtk_drag_source_parent_class)->finalize (object);
} }
@ -314,7 +312,6 @@ drag_end (GtkDragSource *source,
{ {
gboolean delete_data; gboolean delete_data;
g_signal_handlers_disconnect_by_func (source->drag, gtk_drag_source_drop_performed_cb, source);
g_signal_handlers_disconnect_by_func (source->drag, gtk_drag_source_dnd_finished_cb, source); g_signal_handlers_disconnect_by_func (source->drag, gtk_drag_source_dnd_finished_cb, source);
g_signal_handlers_disconnect_by_func (source->drag, gtk_drag_source_cancel_cb, source); g_signal_handlers_disconnect_by_func (source->drag, gtk_drag_source_cancel_cb, source);
@ -348,14 +345,6 @@ gtk_drag_source_cancel_cb (GdkDrag *drag,
drag_end (source, FALSE); drag_end (source, FALSE);
} }
static void
gtk_drag_source_drop_performed_cb (GdkDrag *drag,
GtkDragSource *source)
{
if (source->icon_window)
gtk_widget_hide (source->icon_window);
}
/** /**
* gtk_drag_source_drag_begin: * gtk_drag_source_drag_begin:
* @source: a #GtkDragSource * @source: a #GtkDragSource
@ -383,7 +372,6 @@ gtk_drag_source_drag_begin (GtkDragSource *source,
GdkSurface *surface; GdkSurface *surface;
double px, py; double px, py;
int dx, dy; int dx, dy;
GtkWidget *icon;
g_return_if_fail (GTK_IS_DRAG_SOURCE (source)); g_return_if_fail (GTK_IS_DRAG_SOURCE (source));
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
@ -437,19 +425,8 @@ gtk_drag_source_drag_begin (GtkDragSource *source,
} }
gdk_drag_set_hotspot (source->drag, source->hot_x, source->hot_y); gdk_drag_set_hotspot (source->drag, source->hot_x, source->hot_y);
source->icon_window = gtk_drag_icon_new (); gtk_drag_icon_set_from_paintable (source->drag, source->paintable, source->hot_x, source->hot_y);
g_object_ref_sink (source->icon_window);
gtk_drag_icon_set_surface (GTK_DRAG_ICON (source->icon_window),
gdk_drag_get_drag_surface (source->drag));
icon = gtk_picture_new_for_paintable (source->paintable);
gtk_picture_set_can_shrink (GTK_PICTURE (icon), FALSE);
gtk_drag_icon_set_widget (GTK_DRAG_ICON (source->icon_window), icon);
gtk_widget_show (source->icon_window);
g_signal_connect (source->drag, "drop-performed",
G_CALLBACK (gtk_drag_source_drop_performed_cb), source);
g_signal_connect (source->drag, "dnd-finished", g_signal_connect (source->drag, "dnd-finished",
G_CALLBACK (gtk_drag_source_dnd_finished_cb), source); G_CALLBACK (gtk_drag_source_dnd_finished_cb), source);
g_signal_connect (source->drag, "cancel", g_signal_connect (source->drag, "cancel",