[gtk+] icon theme: Export recoloring function
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] icon theme: Export recoloring function
- Date: Thu, 14 Jan 2016 19:02:39 +0000 (UTC)
commit 1b0ef71696bdfdba34834bba995d6771ec3ae742
Author: Matthias Clasen <mclasen redhat com>
Date: Thu Jan 14 13:49:08 2016 -0500
icon theme: Export recoloring function
This will be used in subsequent commits.
https://bugzilla.gnome.org/show_bug.cgi?id=760536
gtk/gtkicontheme.c | 23 +++++++++++------------
gtk/gtkiconthemeprivate.h | 7 +++++++
2 files changed, 18 insertions(+), 12 deletions(-)
---
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 544f79e..6de7f33 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -4282,12 +4282,12 @@ rgba_to_pixel(const GdkRGBA *rgba,
pixel[3] = 255;
}
-static GdkPixbuf *
-color_symbolic_pixbuf (GdkPixbuf *symbolic,
- const GdkRGBA *fg_color,
- const GdkRGBA *success_color,
- const GdkRGBA *warning_color,
- const GdkRGBA *error_color)
+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)
{
int width, height, x, y, src_stride, dst_stride;
guchar *src_data, *dst_data;
@@ -4397,11 +4397,11 @@ gtk_icon_info_load_symbolic_png (GtkIconInfo *icon_info,
return NULL;
}
- return color_symbolic_pixbuf (icon_info->pixbuf,
- fg ? fg : &fg_default,
- success_color ? success_color : &success_default,
- warning_color ? warning_color : &warning_default,
- error_color ? error_color : &error_default);
+ return gtk_icon_theme_color_symbolic_pixbuf (icon_info->pixbuf,
+ fg ? fg : &fg_default,
+ success_color ? success_color : &success_default,
+ warning_color ? warning_color : &warning_default,
+ error_color ? error_color : &error_default);
}
static GdkPixbuf *
@@ -4539,7 +4539,6 @@ gtk_icon_info_load_symbolic_svg (GtkIconInfo *icon_info,
}
-
static GdkPixbuf *
gtk_icon_info_load_symbolic_internal (GtkIconInfo *icon_info,
const GdkRGBA *fg,
diff --git a/gtk/gtkiconthemeprivate.h b/gtk/gtkiconthemeprivate.h
index ca9d517..0144134 100644
--- a/gtk/gtkiconthemeprivate.h
+++ b/gtk/gtkiconthemeprivate.h
@@ -31,4 +31,11 @@ GtkIconInfo *gtk_icon_info_new_for_file (GFile *file,
gint size,
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__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]