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

Allow passing a color matrix when rendering icons

Browse Source 
This will be used for symbolic icons.
Update all callers.
This commit is contained in:
Matthias Clasen 2017-10-23 11:42:23 +02:00
parent b543257e42
commit e4cdbef092
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk/gtkiconhelper.c
View File

@ -802,7 +802,8 @@ gtk_icon_helper_snapshot (GtkIconHelper *self,
gtk_css_style_snapshot_icon_texture (style, gtk_css_style_snapshot_icon_texture (style,
snapshot, snapshot,
texture, texture,
gtk_widget_get_scale_factor (self->owner)); gtk_widget_get_scale_factor (self->owner),
NULL, NULL);
} }
gboolean gboolean

16
gtk/gtkrendericon.c
View File

@ -271,10 +271,12 @@ gtk_css_style_render_icon_get_extents (GtkCssStyle *style,
} }
void void
gtk_css_style_snapshot_icon_texture (GtkCssStyle *style, gtk_css_style_snapshot_icon_texture (GtkCssStyle *style,
GtkSnapshot *snapshot, GtkSnapshot *snapshot,
GskTexture *texture, GskTexture *texture,
double texture_scale) double texture_scale,
graphene_matrix_t *color_matrix,
graphene_vec4_t * color_offset)
{ {
const GtkCssValue *shadows_value, *transform_value, *filter_value; const GtkCssValue *shadows_value, *transform_value, *filter_value;
graphene_matrix_t transform_matrix; graphene_matrix_t transform_matrix;
@ -307,6 +309,9 @@ gtk_css_style_snapshot_icon_texture (GtkCssStyle *style,
gtk_snapshot_push_shadow (snapshot, shadows, n_shadows, "IconShadow<%zu>", n_shadows); gtk_snapshot_push_shadow (snapshot, shadows, n_shadows, "IconShadow<%zu>", n_shadows);
} }
if (color_matrix)
gtk_snapshot_push_color_matrix (snapshot, color_matrix, color_offset, "Recoloring Icon");
if (graphene_matrix_is_identity (&transform_matrix)) if (graphene_matrix_is_identity (&transform_matrix))
{ {
graphene_rect_init (&bounds, 0, 0, width, height); graphene_rect_init (&bounds, 0, 0, width, height);
@ -331,6 +336,9 @@ gtk_css_style_snapshot_icon_texture (GtkCssStyle *style,
gtk_snapshot_pop (snapshot); gtk_snapshot_pop (snapshot);
} }
if (color_matrix)
gtk_snapshot_pop (snapshot);
if (n_shadows > 0) if (n_shadows > 0)
gtk_snapshot_pop (snapshot); gtk_snapshot_pop (snapshot);

4
gtk/gtkrendericonprivate.h
View File

@ -50,7 +50,9 @@ void gtk_css_style_render_icon_surface (GtkCssStyle *style,
void gtk_css_style_snapshot_icon_texture (GtkCssStyle *style, void gtk_css_style_snapshot_icon_texture (GtkCssStyle *style,
GtkSnapshot *snapshot, GtkSnapshot *snapshot,
GskTexture *texture, GskTexture *texture,
double texture_scale); double texture_scale,
graphene_matrix_t * color_matrix,
graphene_vec4_t * color_offset);
void gtk_css_style_render_icon_get_extents (GtkCssStyle *style, void gtk_css_style_render_icon_get_extents (GtkCssStyle *style,
GdkRectangle *extents, GdkRectangle *extents,

3
gtk/gtksnapshot.c
View File

@ -1517,7 +1517,8 @@ gtk_snapshot_render_icon (GtkSnapshot *snapshot,
gtk_css_style_snapshot_icon_texture (gtk_style_context_lookup_style (context), gtk_css_style_snapshot_icon_texture (gtk_style_context_lookup_style (context),
snapshot, snapshot,
texture, texture,
1); 1,
NULL, NULL);
gtk_snapshot_offset (snapshot, -x, -y); gtk_snapshot_offset (snapshot, -x, -y);
g_object_unref (texture); g_object_unref (texture);
} }