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

render: Split icon surface rendering out

Browse Source 
Just like normal icons, icon surfaces belong into gtkrendericon.c.
This commit is contained in:
Benjamin Otte 2015-01-20 05:21:15 +01:00
parent f6d64f6591
commit 8c745088d5
3 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
gtk/gtkrender.c
View File

@ -1193,24 +1193,6 @@ gtk_render_icon_pixbuf (GtkStyleContext *context,
return gtk_do_render_icon_pixbuf (context, source, size); return gtk_do_render_icon_pixbuf (context, source, size);
} }
static void
gtk_do_render_icon (GtkStyleContext *context,
cairo_t *cr,
GdkPixbuf *pixbuf,
gdouble x,
gdouble y)
{
cairo_save (cr);
gdk_cairo_set_source_pixbuf (cr, pixbuf, x, y);
_gtk_css_shadows_value_paint_icon (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_SHADOW), cr);
cairo_paint (cr);
cairo_restore (cr);
}
/** /**
* gtk_render_icon: * gtk_render_icon:
* @context: a #GtkStyleContext * @context: a #GtkStyleContext
@ -1230,31 +1212,22 @@ gtk_render_icon (GtkStyleContext *context,
gdouble x, gdouble x,
gdouble y) gdouble y)
{ {
cairo_surface_t *surface;
g_return_if_fail (GTK_IS_STYLE_CONTEXT (context)); g_return_if_fail (GTK_IS_STYLE_CONTEXT (context));
g_return_if_fail (cr != NULL); g_return_if_fail (cr != NULL);
cairo_save (cr); cairo_save (cr);
cairo_new_path (cr); cairo_new_path (cr);
gtk_do_render_icon (context, cr, pixbuf, x, y); surface = gdk_cairo_surface_create_from_pixbuf (pixbuf, 1, NULL);
cairo_restore (cr); gtk_css_style_render_icon_surface (gtk_style_context_lookup_style (context),
} cr,
surface,
x, y);
static void cairo_surface_destroy (surface);
gtk_do_render_icon_surface (GtkStyleContext *context,
cairo_t *cr,
cairo_surface_t *surface,
gdouble x,
gdouble y)
{
cairo_save (cr);
cairo_set_source_surface (cr, surface, x, y);
_gtk_css_shadows_value_paint_icon (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_SHADOW), cr);
cairo_paint (cr);
cairo_restore (cr); cairo_restore (cr);
} }
@ -1284,7 +1257,10 @@ gtk_render_icon_surface (GtkStyleContext *context,
cairo_save (cr); cairo_save (cr);
cairo_new_path (cr); cairo_new_path (cr);
gtk_do_render_icon_surface (context, cr, surface, x, y); gtk_css_style_render_icon_surface (gtk_style_context_lookup_style (context),
cr,
surface,
x, y);
cairo_restore (cr); cairo_restore (cr);
} }

18
gtk/gtkrendericon.c
View File

@ -74,3 +74,21 @@ gtk_css_style_render_icon (GtkCssStyle *style,
} }
} }
void
gtk_css_style_render_icon_surface (GtkCssStyle *style,
cairo_t *cr,
cairo_surface_t *surface,
double x,
double y)
{
g_return_if_fail (GTK_IS_CSS_STYLE (style));
g_return_if_fail (cr != NULL);
g_return_if_fail (surface != NULL);
cairo_set_source_surface (cr, surface, x, y);
_gtk_css_shadows_value_paint_icon (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_ICON_SHADOW), cr);
cairo_paint (cr);
}

20
gtk/gtkrendericonprivate.h
View File

@ -29,13 +29,19 @@
G_BEGIN_DECLS G_BEGIN_DECLS
void gtk_css_style_render_icon (GtkCssStyle *style, void gtk_css_style_render_icon (GtkCssStyle *style,
cairo_t *cr, cairo_t *cr,
double x, double x,
double y, double y,
double width, double width,
double height, double height,
GtkCssImageBuiltinType builtin_type); GtkCssImageBuiltinType builtin_type);
void gtk_css_style_render_icon_surface (GtkCssStyle *style,
cairo_t *cr,
cairo_surface_t *surface,
double x,
double y);
G_END_DECLS G_END_DECLS