AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-26 05:31:07 +00:00
Code Issues Projects Releases Wiki Activity

css: Change the api for resolving colors

Browse Source 
We will need to compute other values in here in the future, and for
that we need all the arguments that get passed to compute(), so carry
them along.

Update all callers.
This commit is contained in:
Matthias Clasen 2024-06-02 08:31:09 -04:00
parent 366efc3d61
commit 02fa89df9e
3 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk/deprecated/gtkstylecontext.c
View File

@ -778,13 +778,20 @@ gtk_style_context_resolve_color (GtkStyleContext *context,
{
GtkStyleContextPrivate *priv = gtk_style_context_get_instance_private (context);
GtkCssValue *val;
GtkCssComputeContext ctx = { NULL, };
g_return_val_if_fail (GTK_IS_STYLE_CONTEXT (context), FALSE);
g_return_val_if_fail (color != NULL, FALSE);
g_return_val_if_fail (result != NULL, FALSE);
ctx.provider = GTK_STYLE_PROVIDER (priv->cascade);
ctx.style = gtk_css_node_get_style (priv->cssnode);
if (gtk_css_node_get_parent (priv->cssnode))
ctx.parent_style = gtk_css_node_get_style (gtk_css_node_get_parent (priv->cssnode));
val = gtk_css_color_value_resolve (color,
GTK_STYLE_PROVIDER (priv->cascade),
GTK_CSS_PROPERTY_COLOR,
&ctx,
_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_COLOR));
if (val == NULL)

41
gtk/gtkcsscolorvalue.c
View File

@ -179,9 +179,7 @@ gtk_css_value_color_compute (GtkCssValue *value,
else
current = NULL;
resolved = gtk_css_color_value_resolve (value,
context->provider,
current);
resolved = gtk_css_color_value_resolve (value, property_id, context, current);
}
else if (value->type == COLOR_TYPE_COLOR)
{
@ -191,9 +189,7 @@ gtk_css_value_color_compute (GtkCssValue *value,
{
GtkCssValue *current = context->style->core->color;
resolved = gtk_css_color_value_resolve (value,
context->provider,
current);
resolved = gtk_css_color_value_resolve (value, property_id, context, current);
}
if (resolved == NULL)
@ -507,11 +503,13 @@ apply_color_mix (GtkCssColorSpace in,
}
static GtkCssValue *
gtk_css_color_value_do_resolve (GtkCssValue *color,
GtkStyleProvider *provider,
GtkCssValue *current,
GSList *cycle_list)
gtk_css_color_value_do_resolve (GtkCssValue *color,
guint property_id,
GtkCssComputeContext *context,
GtkCssValue *current,
GSList *cycle_list)
{
GtkStyleProvider *provider = context->provider;
GtkCssValue *value;
gtk_internal_return_val_if_fail (color != NULL, NULL);
@ -536,7 +534,7 @@ gtk_css_color_value_do_resolve (GtkCssValue *color,
if (named == NULL)
return NULL;
value = gtk_css_color_value_do_resolve (named, provider, current, &cycle);
value = gtk_css_color_value_do_resolve (named, property_id, context, current, &cycle);
}
break;
@ -544,8 +542,8 @@ gtk_css_color_value_do_resolve (GtkCssValue *color,
{
GtkCssValue *val1, *val2;
val1 = gtk_css_color_value_do_resolve (color->color_mix.color1, provider, current, cycle_list);
val2 = gtk_css_color_value_do_resolve (color->color_mix.color2, provider, current, cycle_list);
val1 = gtk_css_color_value_do_resolve (color->color_mix.color1, property_id, context, current, cycle_list);
val2 = gtk_css_color_value_do_resolve (color->color_mix.color2, property_id, context, current, cycle_list);
value = apply_color_mix (color->color_mix.color_space,
color->color_mix.hue_interpolation,
@ -564,7 +562,7 @@ gtk_css_color_value_do_resolve (GtkCssValue *color,
GtkCssValue *val;
GdkRGBA shade;
val = gtk_css_color_value_do_resolve (color->shade.color, provider, current, cycle_list);
val = gtk_css_color_value_do_resolve (color->shade.color, property_id, context, current, cycle_list);
if (val == NULL)
return NULL;
c = gtk_css_color_value_get_rgba (val);
@ -582,7 +580,7 @@ gtk_css_color_value_do_resolve (GtkCssValue *color,
GtkCssValue *val;
GdkRGBA alpha;
val = gtk_css_color_value_do_resolve (color->alpha.color, provider, current, cycle_list);
val = gtk_css_color_value_do_resolve (color->alpha.color, property_id, context, current, cycle_list);
if (val == NULL)
return NULL;
c = gtk_css_color_value_get_rgba (val);
@ -600,12 +598,12 @@ gtk_css_color_value_do_resolve (GtkCssValue *color,
GtkCssValue *val1, *val2;
GdkRGBA res;
val1 = gtk_css_color_value_do_resolve (color->mix.color1, provider, current, cycle_list);
val1 = gtk_css_color_value_do_resolve (color->mix.color1, property_id, context, current, cycle_list);
if (val1 == NULL)
return NULL;
color1 = gtk_css_color_value_get_rgba (val1);
val2 = gtk_css_color_value_do_resolve (color->mix.color2, provider, current, cycle_list);
val2 = gtk_css_color_value_do_resolve (color->mix.color2, property_id, context, current, cycle_list);
if (val2 == NULL)
return NULL;
color2 = gtk_css_color_value_get_rgba (val2);
@ -634,11 +632,12 @@ gtk_css_color_value_do_resolve (GtkCssValue *color,
}
GtkCssValue *
gtk_css_color_value_resolve (GtkCssValue *color,
GtkStyleProvider *provider,
GtkCssValue *current)
gtk_css_color_value_resolve (GtkCssValue *color,
guint property_id,
GtkCssComputeContext *context,
GtkCssValue *current)
{
return gtk_css_color_value_do_resolve (color, provider, current, NULL);
return gtk_css_color_value_do_resolve (color, property_id, context, current, NULL);
}
/* }}} */

8
gtk/gtkcsscolorvalueprivate.h
View File

@ -33,9 +33,11 @@ GtkCssValue * gtk_css_color_value_new_name (const char *name) G
gboolean gtk_css_color_value_can_parse (GtkCssParser *parser);
GtkCssValue * gtk_css_color_value_parse (GtkCssParser *parser);
GtkCssValue * gtk_css_color_value_resolve (GtkCssValue *color,
GtkStyleProvider *provider,
GtkCssValue *current);
GtkCssValue * gtk_css_color_value_resolve (GtkCssValue *color,
guint property_id,
GtkCssComputeContext *context,
GtkCssValue *current);
const GdkRGBA * gtk_css_color_value_get_rgba (const GtkCssValue *color) G_GNUC_CONST;
GtkCssValue * gtk_css_color_value_new_color (GtkCssColorSpace color_space,