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

textview: Port dnd icon to be a GdkPaintable

Browse Source
This commit is contained in:
Benjamin Otte 2018-03-26 06:49:55 +02:00
parent 3f28a6851b
commit 9afbf02bc2
3 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gtk/gtktextutil.c
View File

@ -261,14 +261,15 @@ G_GNUC_END_IGNORE_DEPRECATIONS
gtk_style_context_get (context, "font", &values->font, NULL);
}
cairo_surface_t *
_gtk_text_util_create_rich_drag_icon (GtkWidget *widget,
GtkTextBuffer *buffer,
GtkTextIter *start,
GtkTextIter *end)
GdkPaintable *
gtk_text_util_create_rich_drag_icon (GtkWidget *widget,
GtkTextBuffer *buffer,
GtkTextIter *start,
GtkTextIter *end)
{
GtkAllocation allocation;
cairo_surface_t *surface;
GdkPaintable *paintable;
GtkSnapshot *snapshot;
gint layout_width, layout_height;
GtkTextBuffer *new_buffer;
GtkTextLayout *layout;
@ -331,11 +332,10 @@ _gtk_text_util_create_rich_drag_icon (GtkWidget *widget,
layout_width = MIN (layout_width, DRAG_ICON_MAX_WIDTH);
layout_height = MIN (layout_height, DRAG_ICON_MAX_HEIGHT);
surface = gdk_surface_create_similar_surface (gtk_widget_get_surface (widget),
CAIRO_CONTENT_COLOR_ALPHA,
layout_width, layout_height);
cr = cairo_create (surface);
snapshot = gtk_snapshot_new (FALSE, NULL, "RichTextDragIcon");
cr = gtk_snapshot_append_cairo (snapshot,
&GRAPHENE_RECT_INIT (0, 0, layout_width, layout_height),
"Text");
gtk_text_layout_draw (layout, widget, cr);
@ -343,7 +343,9 @@ _gtk_text_util_create_rich_drag_icon (GtkWidget *widget,
g_object_unref (layout);
g_object_unref (new_buffer);
return surface;
paintable = gtk_snapshot_free_to_paintable (snapshot);
return paintable;
}
static gint

2
gtk/gtktextutil.h
View File

@ -41,7 +41,7 @@ void _gtk_text_util_append_special_char_menuitems (GtkMenuShell *me
GdkPaintable * gtk_text_util_create_drag_icon (GtkWidget *widget,
gchar *text,
gsize len);
cairo_surface_t * _gtk_text_util_create_rich_drag_icon (GtkWidget *widget,
GdkPaintable * gtk_text_util_create_rich_drag_icon (GtkWidget *widget,
GtkTextBuffer *buffer,
GtkTextIter *start,
GtkTextIter *end);

10
gtk/gtktextview.c
View File

@ -7692,17 +7692,17 @@ drag_begin_cb (GtkWidget *widget,
GtkTextBuffer *buffer = gtk_text_view_get_buffer (text_view);
GtkTextIter start;
GtkTextIter end;
cairo_surface_t *surface = NULL;
GdkPaintable *paintable = NULL;
g_signal_handlers_disconnect_by_func (widget, drag_begin_cb, NULL);
if (gtk_text_buffer_get_selection_bounds (buffer, &start, &end))
surface = _gtk_text_util_create_rich_drag_icon (widget, buffer, &start, &end);
paintable = gtk_text_util_create_rich_drag_icon (widget, buffer, &start, &end);
if (surface)
if (paintable)
{
gtk_drag_set_icon_surface (context, surface);
cairo_surface_destroy (surface);
gtk_drag_set_icon_paintable (context, paintable, 0, 0);
g_object_unref (paintable);
}
else
{