[gtk+/wip/cssvalue: 105/141] cssvalue: Make GtkCssShadowValue only hold one shadow
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/cssvalue: 105/141] cssvalue: Make GtkCssShadowValue only hold one shadow
- Date: Sat, 7 Apr 2012 17:54:58 +0000 (UTC)
commit 1ec2142728ec909c6fa719cdf0d9fc07553d5263
Author: Benjamin Otte <otte redhat com>
Date: Tue Apr 3 11:49:46 2012 +0200
cssvalue: Make GtkCssShadowValue only hold one shadow
All the properties now are a GtkCssArrayValue of GtkCssSadowValue.
GtkCssArrayValue already does everything we want, so no need to
duplicate its funtionality.
gtk/gtkcssarrayvalue.c | 23 +++
gtk/gtkcssarrayvalueprivate.h | 6 +-
gtk/gtkcssshadowvalue.c | 381 ++++++++++++++--------------------------
gtk/gtkcssshadowvalueprivate.h | 1 -
gtk/gtkcssstylepropertyimpl.c | 10 +-
gtk/gtkthemingbackground.c | 15 ++-
gtk/gtkthemingengine.c | 35 +++-
7 files changed, 199 insertions(+), 272 deletions(-)
---
diff --git a/gtk/gtkcssarrayvalue.c b/gtk/gtkcssarrayvalue.c
index baab5fa..c4f12b0 100644
--- a/gtk/gtkcssarrayvalue.c
+++ b/gtk/gtkcssarrayvalue.c
@@ -154,6 +154,29 @@ _gtk_css_array_value_parse (GtkCssParser *parser,
}
GtkCssValue *
+_gtk_css_array_value_compute (GtkCssValue *value,
+ GtkCssValue * (* compute_func) (GtkCssValue *, GtkStyleContext *),
+ GtkStyleContext *context)
+{
+ GtkCssValue *result;
+ guint i;
+
+ g_return_val_if_fail (value->class == >K_CSS_VALUE_ARRAY, NULL);
+ g_return_val_if_fail (compute_func != NULL, NULL);
+
+ if (value->n_values == 0)
+ return _gtk_css_value_ref (value);
+
+ result = _gtk_css_array_value_new_from_array (value->values, value->n_values);
+ for (i = 0; i < value->n_values; i++)
+ {
+ result->values[i] = (* compute_func) (value->values[i], context);
+ }
+
+ return result;
+}
+
+GtkCssValue *
_gtk_css_array_value_get_nth (const GtkCssValue *value,
guint i)
{
diff --git a/gtk/gtkcssarrayvalueprivate.h b/gtk/gtkcssarrayvalueprivate.h
index 38443b5..ad3ae3c 100644
--- a/gtk/gtkcssarrayvalueprivate.h
+++ b/gtk/gtkcssarrayvalueprivate.h
@@ -22,6 +22,7 @@
#include "gtkcssparserprivate.h"
#include "gtkcssvalueprivate.h"
+#include "gtktypes.h"
G_BEGIN_DECLS
@@ -29,9 +30,12 @@ GtkCssValue * _gtk_css_array_value_new (GtkCssValue *
GtkCssValue * _gtk_css_array_value_new_from_array (GtkCssValue **values,
guint n_values);
GtkCssValue * _gtk_css_array_value_parse (GtkCssParser *parser,
- GtkCssValue * (* parse_func) (GtkCssParser *parser),
+ GtkCssValue * (* parse_func) (GtkCssParser *),
gboolean allow_none);
+GtkCssValue * _gtk_css_array_value_compute (GtkCssValue *value,
+ GtkCssValue * (* compute_func) (GtkCssValue *, GtkStyleContext *),
+ GtkStyleContext *context);
GtkCssValue * _gtk_css_array_value_get_nth (const GtkCssValue *value,
guint i);
guint _gtk_css_array_value_get_n_values (const GtkCssValue *value);
diff --git a/gtk/gtkcssshadowvalue.c b/gtk/gtkcssshadowvalue.c
index 2898a78..a74a992 100644
--- a/gtk/gtkcssshadowvalue.c
+++ b/gtk/gtkcssshadowvalue.c
@@ -25,99 +25,25 @@
#include "gtkthemingengineprivate.h"
#include "gtkpango.h"
-typedef struct _GtkShadowElement GtkShadowElement;
+struct _GtkCssValue {
+ GTK_CSS_VALUE_BASE
+ guint inset :1;
-struct _GtkShadowElement {
gint16 hoffset;
gint16 voffset;
gint16 radius;
gint16 spread;
- gboolean inset;
-
GdkRGBA color;
GtkSymbolicColor *symbolic_color;
};
static void
-shadow_element_print (GtkShadowElement *element,
- GString *str)
-{
- gchar *color_str;
-
- if (element->inset)
- g_string_append (str, "inset ");
-
- g_string_append_printf (str, "%d %d ",
- (gint) element->hoffset,
- (gint) element->voffset);
-
- if (element->radius != 0)
- g_string_append_printf (str, "%d ", (gint) element->radius);
-
- if (element->spread != 0)
- g_string_append_printf (str, "%d ", (gint) element->spread);
-
- if (element->symbolic_color != NULL)
- color_str = gtk_symbolic_color_to_string (element->symbolic_color);
- else
- color_str = gdk_rgba_to_string (&element->color);
-
- g_string_append (str, color_str);
- g_free (color_str);
-}
-
-static void
-shadow_element_free (GtkShadowElement *element)
-{
- if (element->symbolic_color != NULL)
- gtk_symbolic_color_unref (element->symbolic_color);
-
- g_slice_free (GtkShadowElement, element);
-}
-
-static GtkShadowElement *
-shadow_element_new (gdouble hoffset,
- gdouble voffset,
- gdouble radius,
- gdouble spread,
- gboolean inset,
- GdkRGBA *color,
- GtkSymbolicColor *symbolic_color)
-{
- GtkShadowElement *retval;
-
- retval = g_slice_new0 (GtkShadowElement);
-
- retval->hoffset = hoffset;
- retval->voffset = voffset;
- retval->radius = radius;
- retval->spread = spread;
- retval->inset = inset;
-
- if (symbolic_color != NULL)
- retval->symbolic_color = gtk_symbolic_color_ref (symbolic_color);
-
- if (color != NULL)
- retval->color = *color;
-
- return retval;
-}
-
-/****************
- * GtkCssValue *
- ****************/
-
-struct _GtkCssValue {
- GTK_CSS_VALUE_BASE
- GList *elements;
-};
-
-static void
gtk_css_value_shadow_free (GtkCssValue *shadow)
{
- g_list_free_full (shadow->elements,
- (GDestroyNotify) shadow_element_free);
+ if (shadow->symbolic_color != NULL)
+ gtk_symbolic_color_unref (shadow->symbolic_color);
+
g_slice_free (GtkCssValue, shadow);
}
@@ -141,27 +67,28 @@ static void
gtk_css_value_shadow_print (const GtkCssValue *shadow,
GString *string)
{
- gint length;
- GList *l;
+ gchar *color_str;
- length = g_list_length (shadow->elements);
+ if (shadow->inset)
+ g_string_append (string, "inset ");
- if (length == 0)
- {
- g_string_append (string, "none");
- return;
- }
+ g_string_append_printf (string, "%d %d ",
+ (gint) shadow->hoffset,
+ (gint) shadow->voffset);
- shadow_element_print (shadow->elements->data, string);
+ if (shadow->radius != 0)
+ g_string_append_printf (string, "%d ", (gint) shadow->radius);
- if (length == 1)
- return;
+ if (shadow->spread != 0)
+ g_string_append_printf (string, "%d ", (gint) shadow->spread);
- for (l = g_list_next (shadow->elements); l != NULL; l = l->next)
- {
- g_string_append (string, ", ");
- shadow_element_print (l->data, string);
- }
+ if (shadow->symbolic_color != NULL)
+ color_str = gtk_symbolic_color_to_string (shadow->symbolic_color);
+ else
+ color_str = gdk_rgba_to_string (&shadow->color);
+
+ g_string_append (string, color_str);
+ g_free (color_str);
}
static const GtkCssValueClass GTK_CSS_VALUE_SHADOW = {
@@ -171,13 +98,32 @@ static const GtkCssValueClass GTK_CSS_VALUE_SHADOW = {
gtk_css_value_shadow_print
};
-static GtkCssValue none_singleton = { >K_CSS_VALUE_SHADOW, 1, NULL };
-
-GtkCssValue *
-_gtk_css_shadow_value_new_none (void)
+static GtkCssValue *
+gtk_css_shadow_value_new (gdouble hoffset,
+ gdouble voffset,
+ gdouble radius,
+ gdouble spread,
+ gboolean inset,
+ GdkRGBA *color,
+ GtkSymbolicColor *symbolic_color)
{
- return _gtk_css_value_ref (&none_singleton);
-}
+ GtkCssValue *retval;
+
+ retval = _gtk_css_value_new (GtkCssValue, >K_CSS_VALUE_SHADOW);
+
+ retval->hoffset = hoffset;
+ retval->voffset = voffset;
+ retval->radius = radius;
+ retval->spread = spread;
+ retval->inset = inset;
+
+ retval->symbolic_color = symbolic_color;
+
+ if (color != NULL)
+ retval->color = *color;
+
+ return retval;
+}
GtkCssValue *
_gtk_css_shadow_value_parse (GtkCssParser *parser)
@@ -185,120 +131,80 @@ _gtk_css_shadow_value_parse (GtkCssParser *parser)
gboolean have_inset, have_color, have_lengths;
gdouble hoffset, voffset, blur, spread;
GtkSymbolicColor *color;
- GtkShadowElement *element;
- GtkCssValue *shadow;
guint i;
- if (_gtk_css_parser_try (parser, "none", TRUE))
- return _gtk_css_shadow_value_new_none ();
+ have_inset = have_lengths = have_color = FALSE;
- shadow = _gtk_css_value_new (GtkCssValue, >K_CSS_VALUE_SHADOW);
-
- do
+ for (i = 0; i < 3; i++)
{
- have_inset = have_lengths = have_color = FALSE;
-
- for (i = 0; i < 3; i++)
+ if (!have_inset &&
+ _gtk_css_parser_try (parser, "inset", TRUE))
+ {
+ have_inset = TRUE;
+ continue;
+ }
+
+ if (!have_lengths &&
+ _gtk_css_parser_try_double (parser, &hoffset))
{
- if (!have_inset &&
- _gtk_css_parser_try (parser, "inset", TRUE))
+ have_lengths = TRUE;
+
+ if (!_gtk_css_parser_try_double (parser, &voffset))
{
- have_inset = TRUE;
- continue;
+ _gtk_css_parser_error (parser, "Horizontal and vertical offsets are required");
+ if (have_color)
+ gtk_symbolic_color_unref (color);
+ return NULL;
}
-
- if (!have_lengths &&
- _gtk_css_parser_try_double (parser, &hoffset))
- {
- have_lengths = TRUE;
-
- if (!_gtk_css_parser_try_double (parser, &voffset))
- {
- _gtk_css_parser_error (parser, "Horizontal and vertical offsets are required");
- _gtk_css_value_unref (shadow);
- return NULL;
- }
- if (!_gtk_css_parser_try_double (parser, &blur))
- blur = 0;
+ if (!_gtk_css_parser_try_double (parser, &blur))
+ blur = 0;
- if (!_gtk_css_parser_try_double (parser, &spread))
- spread = 0;
+ if (!_gtk_css_parser_try_double (parser, &spread))
+ spread = 0;
- continue;
- }
-
- if (!have_color)
- {
- have_color = TRUE;
-
- /* XXX: the color is optional and UA-defined if it's missing,
- * but it doesn't really make sense for us...
- */
- color = _gtk_css_parser_read_symbolic_color (parser);
-
- if (color == NULL)
- {
- _gtk_css_value_unref (shadow);
- return NULL;
- }
- }
+ continue;
}
- if (!have_color || !have_lengths)
+ if (!have_color)
{
- _gtk_css_parser_error (parser, "Must specify at least color and offsets");
- _gtk_css_value_unref (shadow);
- return NULL;
- }
-
- element = shadow_element_new (hoffset, voffset,
- blur, spread, have_inset,
- NULL, color);
+ have_color = TRUE;
- shadow->elements = g_list_append (shadow->elements, element);
+ /* XXX: the color is optional and UA-defined if it's missing,
+ * but it doesn't really make sense for us...
+ */
+ color = _gtk_css_parser_read_symbolic_color (parser);
- gtk_symbolic_color_unref (color);
+ if (color == NULL)
+ return NULL;
+ }
+ }
+ if (!have_color || !have_lengths)
+ {
+ _gtk_css_parser_error (parser, "Must specify at least color and offsets");
+ return NULL;
}
- while (_gtk_css_parser_try (parser, ",", TRUE));
- return shadow;
+ return gtk_css_shadow_value_new (hoffset, voffset,
+ blur, spread, have_inset,
+ NULL, color);
}
GtkCssValue *
_gtk_css_shadow_value_compute (GtkCssValue *shadow,
GtkStyleContext *context)
{
- GtkCssValue *resolved_shadow;
- GtkShadowElement *element, *resolved_element;
GdkRGBA color;
- GList *l;
-
- resolved_shadow = _gtk_css_value_new (GtkCssValue, >K_CSS_VALUE_SHADOW);
-
- for (l = shadow->elements; l != NULL; l = l->next)
- {
- element = l->data;
-
- if (!_gtk_style_context_resolve_color (context,
- element->symbolic_color,
- &color))
- {
- _gtk_css_value_unref (resolved_shadow);
- return NULL;
- }
-
- resolved_element =
- shadow_element_new (element->hoffset, element->voffset,
- element->radius, element->spread, element->inset,
- &color, NULL);
- resolved_shadow->elements =
- g_list_append (resolved_shadow->elements, resolved_element);
- }
+ if (!_gtk_style_context_resolve_color (context,
+ shadow->symbolic_color,
+ &color))
+ color.red = color.blue = color.green = color.alpha = 0;
- return resolved_shadow;
+ return gtk_css_shadow_value_new (shadow->hoffset, shadow->voffset,
+ shadow->radius, shadow->spread, shadow->inset,
+ &color, NULL);
}
void
@@ -306,52 +212,38 @@ _gtk_css_shadow_value_paint_layout (const GtkCssValue *shadow,
cairo_t *cr,
PangoLayout *layout)
{
- GList *l;
- GtkShadowElement *element;
+ g_return_if_fail (shadow->class == >K_CSS_VALUE_SHADOW);
if (!cairo_has_current_point (cr))
cairo_move_to (cr, 0, 0);
- /* render shadows starting from the last one,
- * and the others on top.
- */
- for (l = g_list_last (shadow->elements); l != NULL; l = l->prev)
- {
- element = l->data;
-
- cairo_save (cr);
+ cairo_save (cr);
- cairo_rel_move_to (cr, element->hoffset, element->voffset);
- gdk_cairo_set_source_rgba (cr, &element->color);
- _gtk_pango_fill_layout (cr, layout);
+ cairo_rel_move_to (cr, shadow->hoffset, shadow->voffset);
+ gdk_cairo_set_source_rgba (cr, &shadow->color);
+ _gtk_pango_fill_layout (cr, layout);
- cairo_rel_move_to (cr, -element->hoffset, -element->voffset);
- cairo_restore (cr);
- }
+ cairo_rel_move_to (cr, -shadow->hoffset, -shadow->voffset);
+ cairo_restore (cr);
}
void
_gtk_css_shadow_value_paint_icon (const GtkCssValue *shadow,
cairo_t *cr)
{
- GList *l;
- GtkShadowElement *element;
cairo_pattern_t *pattern;
- for (l = g_list_last (shadow->elements); l != NULL; l = l->prev)
- {
- element = l->data;
+ g_return_if_fail (shadow->class == >K_CSS_VALUE_SHADOW);
- cairo_save (cr);
- pattern = cairo_pattern_reference (cairo_get_source (cr));
- gdk_cairo_set_source_rgba (cr, &element->color);
+ cairo_save (cr);
+ pattern = cairo_pattern_reference (cairo_get_source (cr));
+ gdk_cairo_set_source_rgba (cr, &shadow->color);
- cairo_translate (cr, element->hoffset, element->voffset);
- cairo_mask (cr, pattern);
+ cairo_translate (cr, shadow->hoffset, shadow->voffset);
+ cairo_mask (cr, pattern);
- cairo_restore (cr);
- cairo_pattern_destroy (pattern);
- }
+ cairo_restore (cr);
+ cairo_pattern_destroy (pattern);
}
void
@@ -360,22 +252,16 @@ _gtk_css_shadow_value_paint_spinner (const GtkCssValue *shadow,
gdouble radius,
gdouble progress)
{
- GtkShadowElement *element;
- GList *l;
+ g_return_if_fail (shadow->class == >K_CSS_VALUE_SHADOW);
- for (l = g_list_last (shadow->elements); l != NULL; l = l->prev)
- {
- element = l->data;
-
- cairo_save (cr);
+ cairo_save (cr);
- cairo_translate (cr, element->hoffset, element->voffset);
- _gtk_theming_engine_paint_spinner (cr,
- radius, progress,
- &element->color);
+ cairo_translate (cr, shadow->hoffset, shadow->voffset);
+ _gtk_theming_engine_paint_spinner (cr,
+ radius, progress,
+ &shadow->color);
- cairo_restore (cr);
- }
+ cairo_restore (cr);
}
void
@@ -383,9 +269,9 @@ _gtk_css_shadow_value_paint_box (const GtkCssValue *shadow,
cairo_t *cr,
const GtkRoundedBox *padding_box)
{
- GtkShadowElement *element;
GtkRoundedBox box;
- GList *l;
+
+ g_return_if_fail (shadow->class == >K_CSS_VALUE_SHADOW);
cairo_save (cr);
cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
@@ -393,28 +279,17 @@ _gtk_css_shadow_value_paint_box (const GtkCssValue *shadow,
_gtk_rounded_box_path (padding_box, cr);
cairo_clip (cr);
- /* render shadows starting from the last one,
- * and the others on top.
- */
- for (l = g_list_last (shadow->elements); l != NULL; l = l->prev)
- {
- element = l->data;
-
- if (!element->inset)
- continue;
-
- box = *padding_box;
- _gtk_rounded_box_move (&box, element->hoffset, element->voffset);
- _gtk_rounded_box_shrink (&box,
- element->spread, element->spread,
- element->spread, element->spread);
+ box = *padding_box;
+ _gtk_rounded_box_move (&box, shadow->hoffset, shadow->voffset);
+ _gtk_rounded_box_shrink (&box,
+ shadow->spread, shadow->spread,
+ shadow->spread, shadow->spread);
- _gtk_rounded_box_path (&box, cr);
- _gtk_rounded_box_clip_path (padding_box, cr);
+ _gtk_rounded_box_path (&box, cr);
+ _gtk_rounded_box_clip_path (padding_box, cr);
- gdk_cairo_set_source_rgba (cr, &element->color);
- cairo_fill (cr);
- }
+ gdk_cairo_set_source_rgba (cr, &shadow->color);
+ cairo_fill (cr);
cairo_restore (cr);
}
diff --git a/gtk/gtkcssshadowvalueprivate.h b/gtk/gtkcssshadowvalueprivate.h
index 5bb40c9..a53badd 100644
--- a/gtk/gtkcssshadowvalueprivate.h
+++ b/gtk/gtkcssshadowvalueprivate.h
@@ -30,7 +30,6 @@
G_BEGIN_DECLS
-GtkCssValue * _gtk_css_shadow_value_new_none (void);
GtkCssValue * _gtk_css_shadow_value_parse (GtkCssParser *parser);
GtkCssValue * _gtk_css_shadow_value_compute (GtkCssValue *shadow,
diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c
index d06d037..25f2607 100644
--- a/gtk/gtkcssstylepropertyimpl.c
+++ b/gtk/gtkcssstylepropertyimpl.c
@@ -486,7 +486,7 @@ shadow_value_parse (GtkCssStyleProperty *property,
GtkCssParser *parser,
GFile *base)
{
- return _gtk_css_shadow_value_parse (parser);
+ return _gtk_css_array_value_parse (parser, _gtk_css_shadow_value_parse, TRUE);
}
static GtkCssValue *
@@ -494,7 +494,7 @@ shadow_value_compute (GtkCssStyleProperty *property,
GtkStyleContext *context,
GtkCssValue *specified)
{
- return _gtk_css_shadow_value_compute (specified, context);
+ return _gtk_css_array_value_compute (specified, _gtk_css_shadow_value_compute, context);
}
static GtkCssValue *
@@ -1327,7 +1327,7 @@ _gtk_css_style_property_init_properties (void)
NULL,
NULL,
NULL,
- _gtk_css_shadow_value_new_none ());
+ _gtk_css_array_value_new (NULL));
gtk_css_style_property_register ("icon-shadow",
GTK_CSS_PROPERTY_ICON_SHADOW,
@@ -1339,7 +1339,7 @@ _gtk_css_style_property_init_properties (void)
NULL,
NULL,
NULL,
- _gtk_css_shadow_value_new_none ());
+ _gtk_css_array_value_new (NULL));
gtk_css_style_property_register ("box-shadow",
GTK_CSS_PROPERTY_BOX_SHADOW,
@@ -1351,7 +1351,7 @@ _gtk_css_style_property_init_properties (void)
NULL,
NULL,
NULL,
- _gtk_css_shadow_value_new_none ());
+ _gtk_css_array_value_new (NULL));
gtk_css_style_property_register ("margin-top",
GTK_CSS_PROPERTY_MARGIN_TOP,
diff --git a/gtk/gtkthemingbackground.c b/gtk/gtkthemingbackground.c
index f6ae1d5..d4d1339 100644
--- a/gtk/gtkthemingbackground.c
+++ b/gtk/gtkthemingbackground.c
@@ -23,6 +23,7 @@
#include "gtkthemingbackgroundprivate.h"
+#include "gtkcssarrayvalueprivate.h"
#include "gtkcssenumvalueprivate.h"
#include "gtkcssimagevalueprivate.h"
#include "gtkcsstypesprivate.h"
@@ -298,9 +299,17 @@ static void
_gtk_theming_background_apply_shadow (GtkThemingBackground *bg,
cairo_t *cr)
{
- _gtk_css_shadow_value_paint_box (_gtk_style_context_peek_property (bg->context, GTK_CSS_PROPERTY_BOX_SHADOW),
- cr,
- &bg->padding_box);
+ GtkCssValue *shadows;
+ guint i;
+
+ shadows = _gtk_style_context_peek_property (bg->context, GTK_CSS_PROPERTY_BOX_SHADOW);
+
+ for (i = 0; i < _gtk_css_array_value_get_n_values (shadows); i++)
+ {
+ _gtk_css_shadow_value_paint_box (_gtk_css_array_value_get_nth (shadows, i),
+ cr,
+ &bg->padding_box);
+ }
}
static void
diff --git a/gtk/gtkthemingengine.c b/gtk/gtkthemingengine.c
index 27d290c..cd7ecad 100644
--- a/gtk/gtkthemingengine.c
+++ b/gtk/gtkthemingengine.c
@@ -28,6 +28,7 @@
#include "gtkmodulesprivate.h"
#include "gtkborderimageprivate.h"
#include "gtkpango.h"
+#include "gtkcssarrayvalueprivate.h"
#include "gtkcssenumvalueprivate.h"
#include "gtkcssrgbavalueprivate.h"
#include "gtkcssshadowvalueprivate.h"
@@ -2100,10 +2101,11 @@ gtk_theming_engine_render_layout (GtkThemingEngine *engine,
PangoLayout *layout)
{
GdkRGBA fg_color;
- GtkCssValue *text_shadow = NULL;
+ GtkCssValue *shadows;
GtkStateFlags flags;
gdouble progress;
gboolean running;
+ guint i;
cairo_save (cr);
flags = gtk_theming_engine_get_state (engine);
@@ -2132,11 +2134,14 @@ gtk_theming_engine_render_layout (GtkThemingEngine *engine,
fg_color.alpha = CLAMP (fg_color.alpha + ((other_fg.alpha - fg_color.alpha) * progress), 0, 1);
}
- text_shadow = _gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_TEXT_SHADOW);
+ shadows = _gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_TEXT_SHADOW);
prepare_context_for_layout (cr, x, y, layout);
- _gtk_css_shadow_value_paint_layout (text_shadow, cr, layout);
+ for (i = 0; i < _gtk_css_array_value_get_n_values (shadows); i++)
+ {
+ _gtk_css_shadow_value_paint_layout (_gtk_css_array_value_get_nth (shadows, i), cr, layout);
+ }
gdk_cairo_set_source_rgba (cr, &fg_color);
pango_cairo_show_layout (cr, layout);
@@ -2750,10 +2755,11 @@ render_spinner (GtkThemingEngine *engine,
gdouble height)
{
GtkStateFlags state;
- GtkCssValue *shadow;
+ GtkCssValue *shadows;
GdkRGBA color;
gdouble progress;
gdouble radius;
+ guint i;
state = gtk_theming_engine_get_state (engine);
@@ -2763,14 +2769,18 @@ render_spinner (GtkThemingEngine *engine,
radius = MIN (width / 2, height / 2);
gtk_theming_engine_get_color (engine, state, &color);
- shadow = _gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_ICON_SHADOW);
+ shadows = _gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_ICON_SHADOW);
cairo_save (cr);
cairo_translate (cr, x + width / 2, y + height / 2);
- _gtk_css_shadow_value_paint_spinner (shadow, cr,
- radius,
- progress);
+ for (i = 0; i < _gtk_css_array_value_get_n_values (shadows); i++)
+ {
+ _gtk_css_shadow_value_paint_spinner (_gtk_css_array_value_get_nth (shadows, i),
+ cr,
+ radius,
+ progress);
+ }
_gtk_theming_engine_paint_spinner (cr,
radius,
@@ -2937,11 +2947,18 @@ gtk_theming_engine_render_icon (GtkThemingEngine *engine,
gdouble x,
gdouble y)
{
+ GtkCssValue *shadows;
+ guint i;
+
cairo_save (cr);
gdk_cairo_set_source_pixbuf (cr, pixbuf, x, y);
- _gtk_css_shadow_value_paint_icon (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_ICON_SHADOW), cr);
+ shadows = _gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_ICON_SHADOW);
+ for (i = 0; i < _gtk_css_array_value_get_n_values (shadows); i++)
+ {
+ _gtk_css_shadow_value_paint_icon (_gtk_css_array_value_get_nth (shadows, i), cr);
+ }
cairo_paint (cr);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
