AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-02 17:00:19 +00:00
Code Issues Projects Releases Wiki Activity

dnd: Stop using gdk_cursor_new_from_pixbuf

Browse Source 
We can just use gdk_cursor_new_from_texture here.
This commit is contained in:
Matthias Clasen 2017-11-29 20:13:26 -05:00
parent a8a156e63c
commit 1fcfff6861
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gtk/gtkdnd.c
View File

@ -244,7 +244,7 @@ static void set_icon_helper (GdkDragContext *context,
static struct { static struct {
GdkDragAction action; GdkDragAction action;
const gchar *name; const gchar *name;
GdkPixbuf *pixbuf; GdkTexture *texture;
GdkCursor *cursor; GdkCursor *cursor;
} drag_cursors[] = { } drag_cursors[] = {
{ GDK_ACTION_DEFAULT, NULL }, { GDK_ACTION_DEFAULT, NULL },
@ -442,17 +442,12 @@ gtk_drag_get_event_actions (const GdkEvent *event,
} }
static void static void
ensure_drag_cursor_pixbuf (int i) ensure_drag_cursor_texture (int i)
{ {
if (drag_cursors[i].pixbuf == NULL) if (drag_cursors[i].texture == NULL)
{ {
char *path = g_strconcat ("/org/gtk/libgtk/cursor/", drag_cursors[i].name, ".png", NULL); char *path = g_strconcat ("/org/gtk/libgtk/cursor/", drag_cursors[i].name, ".png", NULL);
GInputStream *stream = g_resources_open_stream (path, 0, NULL); drag_cursors[i].texture = gdk_texture_new_from_resource (path);
if (stream != NULL)
{
drag_cursors[i].pixbuf = gdk_pixbuf_new_from_stream (stream, NULL, NULL);
g_object_unref (stream);
}
g_free (path); g_free (path);
} }
} }
@ -482,8 +477,8 @@ gtk_drag_get_cursor (GtkWidget *widget,
if (drag_cursors[i].cursor == NULL) if (drag_cursors[i].cursor == NULL)
{ {
ensure_drag_cursor_pixbuf (i); ensure_drag_cursor_texture (i);
drag_cursors[i].cursor = gdk_cursor_new_from_pixbuf (drag_cursors[i].pixbuf, 0, 0, NULL); drag_cursors[i].cursor = gdk_cursor_new_from_texture (drag_cursors[i].texture, 0, 0, NULL);
} }
return drag_cursors[i].cursor; return drag_cursors[i].cursor;