render: Split icon rendering into its own file

4 files changed, 127 insertions, 51 deletions

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 0deed771ce..4059603021 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -478,6 +478,7 @@ gtk_private_h_sources =		\
 	gtkrecentchooserutils.h	\
 	gtkrenderbackgroundprivate.h \
 	gtkrenderborderprivate.h \
+	gtkrendericonprivate.h	\
 	gtkrenderprivate.h	\
 	gtkresources.h		\
 	gtkroundedboxprivate.h	\
@@ -762,6 +763,7 @@ gtk_base_c_sources = 		\
 	gtkrender.c		\
 	gtkrenderbackground.c	\
 	gtkrenderborder.c	\
+	gtkrendericon.c		\
 	gtkresources.c		\
 	gtkrevealer.c		\
 	gtkroundedbox.c		\
diff --git a/gtk/gtkrender.c b/gtk/gtkrender.c
index d5d3ad10b8..165c727254 100644
--- a/gtk/gtkrender.c
+++ b/gtk/gtkrender.c
@@ -33,56 +33,12 @@
 #include "gtkhslaprivate.h"
 #include "gtkrenderbackgroundprivate.h"
 #include "gtkrenderborderprivate.h"
+#include "gtkrendericonprivate.h"
 #include "gtkstylecontextprivate.h"
 
 #include "fallback-c89.c"
 
 static void
-render_icon_image (GtkStyleContext        *context,
-                   cairo_t                *cr,
-                   double                  x,
-                   double                  y,
-                   double                  width,
-                   double                  height,
-                   GtkCssImageBuiltinType  builtin_type)
-{
-  const GtkCssValue *shadows;
-  cairo_matrix_t matrix, transform_matrix;
-  GtkCssImage *image;
-
-  image = _gtk_css_image_value_get_image (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_SOURCE));
-  if (image == NULL)
-    return;
-
-  shadows = _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_SHADOW);
-
-  cairo_translate (cr, x, y);
-
-  if (_gtk_css_transform_value_get_matrix (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_TRANSFORM), &transform_matrix))
-    {
-      /* XXX: Implement -gtk-icon-transform-origin instead of hardcoding "50% 50%" here */
-      cairo_matrix_init_translate (&matrix, width / 2, height / 2);
-      cairo_matrix_multiply (&matrix, &transform_matrix, &matrix);
-      cairo_matrix_translate (&matrix, - width / 2, - height / 2);
-
-      if (_gtk_css_shadows_value_is_none (shadows))
-        {
-          cairo_transform (cr, &matrix);
-          gtk_css_image_builtin_draw (image, cr, width, height, builtin_type);
-        }
-      else
-        {
-          cairo_push_group (cr);
-          cairo_transform (cr, &matrix);
-          gtk_css_image_builtin_draw (image, cr, width, height, builtin_type);
-          cairo_pop_group_to_source (cr);
-          _gtk_css_shadows_value_paint_icon (shadows, cr);
-          cairo_paint (cr);
-        }
-    }
-}
-
-static void
 gtk_do_render_check (GtkStyleContext *context,
                      cairo_t         *cr,
                      gdouble          x,
@@ -101,7 +57,7 @@ gtk_do_render_check (GtkStyleContext *context,
   else
     image_type = GTK_CSS_IMAGE_BUILTIN_CHECK;
 
-  render_icon_image (context, cr, x, y, width, height, image_type);
+  gtk_css_style_render_icon (gtk_style_context_lookup_style (context), cr, x, y, width, height, image_type);
 }
 
 /**
@@ -166,7 +122,7 @@ gtk_do_render_option (GtkStyleContext *context,
   else
     image_type = GTK_CSS_IMAGE_BUILTIN_OPTION;
 
-  render_icon_image (context, cr, x, y, width, height, image_type);
+  gtk_css_style_render_icon (gtk_style_context_lookup_style (context), cr, x, y, width, height, image_type);
 }
 
 /**
@@ -243,7 +199,7 @@ gtk_do_render_arrow (GtkStyleContext *context,
     break;
   }
 
-  render_icon_image (context, cr, x, y, size, size, image_type);
+  gtk_css_style_render_icon (gtk_style_context_lookup_style (context), cr, x, y, size, size, image_type);
 }
 
 /**
@@ -411,7 +367,7 @@ gtk_do_render_expander (GtkStyleContext *context,
                      : GTK_CSS_IMAGE_BUILTIN_EXPANDER_VERTICAL_LEFT;
     }
 
-  render_icon_image (context, cr, x, y, width, height, image_type);
+  gtk_css_style_render_icon (gtk_style_context_lookup_style (context), cr, x, y, width, height, image_type);
 }
 
 /**
@@ -998,7 +954,7 @@ gtk_do_render_handle (GtkStyleContext *context,
       type = GTK_CSS_IMAGE_BUILTIN_HANDLE;
     }
 
-  render_icon_image (context, cr, x, y, width, height, type);
+  gtk_css_style_render_icon (gtk_style_context_lookup_style (context), cr, x, y, width, height, type);
 }
 
 /**
@@ -1074,7 +1030,7 @@ gtk_render_activity (GtkStyleContext *context,
   cairo_save (cr);
   cairo_new_path (cr);
 
-  render_icon_image (context, cr, x, y, width, height, GTK_CSS_IMAGE_BUILTIN_SPINNER);
+  gtk_css_style_render_icon (gtk_style_context_lookup_style (context), cr, x, y, width, height, GTK_CSS_IMAGE_BUILTIN_SPINNER);
 
   cairo_restore (cr);
 }
diff --git a/gtk/gtkrendericon.c b/gtk/gtkrendericon.c
new file mode 100644
index 0000000000..8d8f19502e
--- /dev/null
+++ b/gtk/gtkrendericon.c
@@ -0,0 +1,76 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 2014,2015 Benjamin Otte
+ * 
+ * Authors: Benjamin Otte <otte@gnome.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include "gtkrendericonprivate.h"
+
+#include "gtkcssimagevalueprivate.h"
+#include "gtkcssshadowsvalueprivate.h"
+#include "gtkcssstyleprivate.h"
+#include "gtkcsstransformvalueprivate.h"
+
+void
+gtk_css_style_render_icon (GtkCssStyle            *style,
+                           cairo_t                *cr,
+                           double                  x,
+                           double                  y,
+                           double                  width,
+                           double                  height,
+                           GtkCssImageBuiltinType  builtin_type)
+{
+  const GtkCssValue *shadows;
+  cairo_matrix_t matrix, transform_matrix;
+  GtkCssImage *image;
+
+  g_return_if_fail (GTK_IS_CSS_STYLE (style));
+  g_return_if_fail (cr != NULL);
+
+  image = _gtk_css_image_value_get_image (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_ICON_SOURCE));
+  if (image == NULL)
+    return;
+
+  shadows = gtk_css_style_get_value (style, GTK_CSS_PROPERTY_ICON_SHADOW);
+
+  cairo_translate (cr, x, y);
+
+  if (_gtk_css_transform_value_get_matrix (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_ICON_TRANSFORM), &transform_matrix))
+    {
+      /* XXX: Implement -gtk-icon-transform-origin instead of hardcoding "50% 50%" here */
+      cairo_matrix_init_translate (&matrix, width / 2, height / 2);
+      cairo_matrix_multiply (&matrix, &transform_matrix, &matrix);
+      cairo_matrix_translate (&matrix, - width / 2, - height / 2);
+
+      if (_gtk_css_shadows_value_is_none (shadows))
+        {
+          cairo_transform (cr, &matrix);
+          gtk_css_image_builtin_draw (image, cr, width, height, builtin_type);
+        }
+      else
+        {
+          cairo_push_group (cr);
+          cairo_transform (cr, &matrix);
+          gtk_css_image_builtin_draw (image, cr, width, height, builtin_type);
+          cairo_pop_group_to_source (cr);
+          _gtk_css_shadows_value_paint_icon (shadows, cr);
+          cairo_paint (cr);
+        }
+    }
+}
+
diff --git a/gtk/gtkrendericonprivate.h b/gtk/gtkrendericonprivate.h
new file mode 100644
index 0000000000..2fc8c49857
--- /dev/null
+++ b/gtk/gtkrendericonprivate.h
@@ -0,0 +1,42 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 2014,2015 Benjamin Otte
+ * 
+ * Authors: Benjamin Otte <otte@gnome.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GTK_RENDER_ICON_PRIVATE_H__
+#define __GTK_RENDER_ICON_PRIVATE_H__
+
+#include <glib-object.h>
+#include <cairo.h>
+
+#include "gtkcsstypesprivate.h"
+#include "gtkcssimagebuiltinprivate.h"
+#include "gtktypes.h"
+
+G_BEGIN_DECLS
+
+void    gtk_css_style_render_icon     (GtkCssStyle            *style,
+                                       cairo_t                *cr,
+                                       double                  x,
+                                       double                  y,
+                                       double                  width,
+                                       double                  height,
+                                       GtkCssImageBuiltinType  builtin_type);
+
+G_END_DECLS
+
+#endif /* __GTK_RENDER_ICON_PRIVATE_H__ */