I don't want to confuse css values with other stuff, so there.
GtkCssParser *parser,
GFile *base)
{
- return _gtk_shadow_parse (parser);
+ return _gtk_css_shadow_value_parse (parser);
}
static GtkCssValue *
GtkStyleContext *context,
GtkCssValue *specified)
{
- return _gtk_shadow_resolve (specified, context);
+ return _gtk_css_shadow_value_compute (specified, context);
}
static GtkCssValue *
shadow_value_compute,
NULL,
NULL,
- _gtk_shadow_new_none ());
+ _gtk_css_shadow_value_new_none ());
gtk_css_style_property_register ("icon-shadow",
G_TYPE_NONE,
shadow_value_compute,
NULL,
NULL,
- _gtk_shadow_new_none ());
+ _gtk_css_shadow_value_new_none ());
gtk_css_style_property_register ("box-shadow",
G_TYPE_NONE,
shadow_value_compute,
NULL,
NULL,
- _gtk_shadow_new_none ());
+ _gtk_css_shadow_value_new_none ());
gtk_css_style_property_register ("margin-top",
G_TYPE_INT,
}
/****************
- * GtkShadow *
+ * GtkCssValue *
****************/
struct _GtkCssValue {
{
g_list_free_full (shadow->elements,
(GDestroyNotify) shadow_element_free);
- g_slice_free (GtkShadow, shadow);
+ g_slice_free (GtkCssValue, shadow);
}
static gboolean
static GtkCssValue none_singleton = { >K_CSS_VALUE_SHADOW, 1, NULL };
-GtkShadow *
-_gtk_shadow_new_none (void)
+GtkCssValue *
+_gtk_css_shadow_value_new_none (void)
{
return _gtk_css_value_ref (&none_singleton);
}
-GtkShadow *
-_gtk_shadow_parse (GtkCssParser *parser)
+GtkCssValue *
+_gtk_css_shadow_value_parse (GtkCssParser *parser)
{
gboolean have_inset, have_color, have_lengths;
gdouble hoffset, voffset, blur, spread;
GtkSymbolicColor *color;
GtkShadowElement *element;
- GtkShadow *shadow;
+ GtkCssValue *shadow;
guint i;
if (_gtk_css_parser_try (parser, "none", TRUE))
- return _gtk_shadow_new_none ();
+ return _gtk_css_shadow_value_new_none ();
- shadow = _gtk_css_value_new (GtkShadow, >K_CSS_VALUE_SHADOW);
+ shadow = _gtk_css_value_new (GtkCssValue, >K_CSS_VALUE_SHADOW);
do
{
return shadow;
}
-GtkShadow *
-_gtk_shadow_resolve (GtkShadow *shadow,
- GtkStyleContext *context)
+GtkCssValue *
+_gtk_css_shadow_value_compute (GtkCssValue *shadow,
+ GtkStyleContext *context)
{
- GtkShadow *resolved_shadow;
+ GtkCssValue *resolved_shadow;
GtkShadowElement *element, *resolved_element;
GdkRGBA color;
GList *l;
- resolved_shadow = _gtk_css_value_new (GtkShadow, >K_CSS_VALUE_SHADOW);
+ resolved_shadow = _gtk_css_value_new (GtkCssValue, >K_CSS_VALUE_SHADOW);
for (l = shadow->elements; l != NULL; l = l->next)
{
}
void
-_gtk_text_shadow_paint_layout (GtkShadow *shadow,
- cairo_t *cr,
- PangoLayout *layout)
+_gtk_css_shadow_value_paint_layout (const GtkCssValue *shadow,
+ cairo_t *cr,
+ PangoLayout *layout)
{
GList *l;
GtkShadowElement *element;
}
void
-_gtk_icon_shadow_paint (GtkShadow *shadow,
- cairo_t *cr)
+_gtk_css_shadow_value_paint_icon (const GtkCssValue *shadow,
+ cairo_t *cr)
{
GList *l;
GtkShadowElement *element;
}
void
-_gtk_icon_shadow_paint_spinner (GtkShadow *shadow,
- cairo_t *cr,
- gdouble radius,
- gdouble progress)
+_gtk_css_shadow_value_paint_spinner (const GtkCssValue *shadow,
+ cairo_t *cr,
+ gdouble radius,
+ gdouble progress)
{
GtkShadowElement *element;
GList *l;
}
void
-_gtk_box_shadow_render (GtkShadow *shadow,
- cairo_t *cr,
- const GtkRoundedBox *padding_box)
+_gtk_css_shadow_value_paint_box (const GtkCssValue *shadow,
+ cairo_t *cr,
+ const GtkRoundedBox *padding_box)
{
GtkShadowElement *element;
GtkRoundedBox box;
#ifndef __GTK_SHADOW_H__
#define __GTK_SHADOW_H__
-#include <glib-object.h>
+#include <cairo.h>
+#include <pango/pango.h>
-#include "gtkstylecontext.h"
-#include "gtksymboliccolor.h"
-#include "gtkicontheme.h"
+#include "gtktypes.h"
#include "gtkcssparserprivate.h"
-#include "gtkcsstypesprivate.h"
#include "gtkcssvalueprivate.h"
#include "gtkroundedboxprivate.h"
G_BEGIN_DECLS
-typedef GtkCssValue GtkShadow;
+GtkCssValue * _gtk_css_shadow_value_new_none (void);
+GtkCssValue * _gtk_css_shadow_value_parse (GtkCssParser *parser);
-GtkShadow *_gtk_shadow_new_none (void);
-GtkShadow *_gtk_shadow_parse (GtkCssParser *parser);
+GtkCssValue * _gtk_css_shadow_value_compute (GtkCssValue *shadow,
+ GtkStyleContext *context);
-GtkShadow *_gtk_shadow_resolve (GtkShadow *shadow,
- GtkStyleContext *context);
+void _gtk_css_shadow_value_paint_layout (const GtkCssValue *shadow,
+ cairo_t *cr,
+ PangoLayout *layout);
-void _gtk_text_shadow_paint_layout (GtkShadow *shadow,
- cairo_t *cr,
- PangoLayout *layout);
+void _gtk_css_shadow_value_paint_icon (const GtkCssValue *shadow,
+ cairo_t *cr);
-void _gtk_icon_shadow_paint (GtkShadow *shadow,
- cairo_t *cr);
-
-void _gtk_icon_shadow_paint_spinner (GtkShadow *shadow,
- cairo_t *cr,
- gdouble radius,
- gdouble progress);
-void _gtk_box_shadow_render (GtkShadow *shadow,
- cairo_t *cr,
- const GtkRoundedBox *padding_box);
+void _gtk_css_shadow_value_paint_spinner (const GtkCssValue *shadow,
+ cairo_t *cr,
+ gdouble radius,
+ gdouble progress);
+void _gtk_css_shadow_value_paint_box (const GtkCssValue *shadow,
+ cairo_t *cr,
+ const GtkRoundedBox *padding_box);
G_END_DECLS
_gtk_theming_background_apply_shadow (GtkThemingBackground *bg,
cairo_t *cr)
{
- _gtk_box_shadow_render (_gtk_style_context_peek_property (bg->context, "box-shadow"),
- cr,
- &bg->padding_box);
+ _gtk_css_shadow_value_paint_box (_gtk_style_context_peek_property (bg->context, "box-shadow"),
+ cr,
+ &bg->padding_box);
}
static void
PangoLayout *layout)
{
GdkRGBA fg_color;
- GtkShadow *text_shadow = NULL;
+ GtkCssValue *text_shadow = NULL;
GtkStateFlags flags;
gdouble progress;
gboolean running;
prepare_context_for_layout (cr, x, y, layout);
- _gtk_text_shadow_paint_layout (text_shadow, cr, layout);
+ _gtk_css_shadow_value_paint_layout (text_shadow, cr, layout);
gdk_cairo_set_source_rgba (cr, &fg_color);
pango_cairo_show_layout (cr, layout);
gdouble height)
{
GtkStateFlags state;
- GtkShadow *shadow;
+ GtkCssValue *shadow;
GdkRGBA color;
gdouble progress;
gdouble radius;
cairo_save (cr);
cairo_translate (cr, x + width / 2, y + height / 2);
- _gtk_icon_shadow_paint_spinner (shadow, cr,
- radius,
- progress);
+ _gtk_css_shadow_value_paint_spinner (shadow, cr,
+ radius,
+ progress);
_gtk_theming_engine_paint_spinner (cr,
radius,
gdk_cairo_set_source_pixbuf (cr, pixbuf, x, y);
- _gtk_icon_shadow_paint (_gtk_theming_engine_peek_property (engine, "icon-shadow"), cr);
+ _gtk_css_shadow_value_paint_icon (_gtk_theming_engine_peek_property (engine, "icon-shadow"), cr);
cairo_paint (cr);