callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

icon theme: Export recoloring function

Browse Source 
This will be used in subsequent commits.

https://bugzilla.gnome.org/show_bug.cgi?id=760536
This commit is contained in:
Matthias Clasen 2016-01-14 13:49:08 -05:00
parent 7d717c8113
commit 1b0ef71696
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gtk/gtkicontheme.c
View File

@ -4282,12 +4282,12 @@ rgba_to_pixel(const GdkRGBA *rgba,
pixel[3] = 255; pixel[3] = 255;
} }
static GdkPixbuf * GdkPixbuf *
color_symbolic_pixbuf (GdkPixbuf *symbolic, gtk_icon_theme_color_symbolic_pixbuf (GdkPixbuf *symbolic,
const GdkRGBA *fg_color, const GdkRGBA *fg_color,
const GdkRGBA *success_color, const GdkRGBA *success_color,
const GdkRGBA *warning_color, const GdkRGBA *warning_color,
const GdkRGBA *error_color) const GdkRGBA *error_color)
{ {
int width, height, x, y, src_stride, dst_stride; int width, height, x, y, src_stride, dst_stride;
guchar *src_data, *dst_data; guchar *src_data, *dst_data;
@ -4397,11 +4397,11 @@ gtk_icon_info_load_symbolic_png (GtkIconInfo *icon_info,
return NULL; return NULL;
} }
return color_symbolic_pixbuf (icon_info->pixbuf, return gtk_icon_theme_color_symbolic_pixbuf (icon_info->pixbuf,
fg ? fg : &fg_default, fg ? fg : &fg_default,
success_color ? success_color : &success_default, success_color ? success_color : &success_default,
warning_color ? warning_color : &warning_default, warning_color ? warning_color : &warning_default,
error_color ? error_color : &error_default); error_color ? error_color : &error_default);
} }
static GdkPixbuf * static GdkPixbuf *
@ -4539,7 +4539,6 @@ gtk_icon_info_load_symbolic_svg (GtkIconInfo *icon_info,
} }
static GdkPixbuf * static GdkPixbuf *
gtk_icon_info_load_symbolic_internal (GtkIconInfo *icon_info, gtk_icon_info_load_symbolic_internal (GtkIconInfo *icon_info,
const GdkRGBA *fg, const GdkRGBA *fg,

7
gtk/gtkiconthemeprivate.h
View File

@ -31,4 +31,11 @@ GtkIconInfo *gtk_icon_info_new_for_file (GFile *file,
gint size, gint size,
gint scale); gint scale);
GdkPixbuf * gtk_icon_theme_color_symbolic_pixbuf (GdkPixbuf *symbolic,
const GdkRGBA *fg_color,
const GdkRGBA *success_color,
const GdkRGBA *warning_color,
const GdkRGBA *error_color);
#endif /* __GTK_ICON_THEME_PRIVATE_H__ */ #endif /* __GTK_ICON_THEME_PRIVATE_H__ */