AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-12 21:40:19 +00:00
Code Issues Projects Releases Wiki Activity

Cosmetics

Browse Source
This commit is contained in:
Matthias Clasen 2024-06-02 09:25:52 -04:00
parent 62b9a4af75
commit 20392e8840
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
gtk/gtkcsscolorvalue.c
View File

@ -348,7 +348,7 @@ apply_shade (const GdkRGBA *in,
static inline double static inline double
transition (double start, transition (double start,
double end, double end,
double progress) double progress)
{ {
return start + (end - start) * progress; return start + (end - start) * progress;
} }
@ -664,6 +664,29 @@ gtk_css_color_value_new_current_color (void)
/* }}} */ /* }}} */
/* {{{ Parsing */ /* {{{ Parsing */
gboolean
gtk_css_color_value_can_parse (GtkCssParser *parser)
{
/* This is way too generous, but meh... */
return gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_IDENT)
|| gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_AT_KEYWORD)
|| gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_HASH_ID)
|| gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_HASH_UNRESTRICTED)
|| gtk_css_parser_has_function (parser, "lighter")
|| gtk_css_parser_has_function (parser, "darker")
|| gtk_css_parser_has_function (parser, "shade")
|| gtk_css_parser_has_function (parser, "alpha")
|| gtk_css_parser_has_function (parser, "mix")
|| gtk_css_parser_has_function (parser, "hsl")
|| gtk_css_parser_has_function (parser, "hsla")
|| gtk_css_parser_has_function (parser, "rgb")
|| gtk_css_parser_has_function (parser, "rgba")
|| gtk_css_parser_has_function (parser, "hwb")
|| gtk_css_parser_has_function (parser, "oklab")
|| gtk_css_parser_has_function (parser, "oklch")
|| gtk_css_parser_has_function (parser, "color");
}
typedef struct typedef struct
{ {
GtkCssValue *color; GtkCssValue *color;
@ -727,29 +750,6 @@ parse_color_number (GtkCssParser *parser,
} }
} }
gboolean
gtk_css_color_value_can_parse (GtkCssParser *parser)
{
/* This is way too generous, but meh... */
return gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_IDENT)
|| gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_AT_KEYWORD)
|| gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_HASH_ID)
|| gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_HASH_UNRESTRICTED)
|| gtk_css_parser_has_function (parser, "lighter")
|| gtk_css_parser_has_function (parser, "darker")
|| gtk_css_parser_has_function (parser, "shade")
|| gtk_css_parser_has_function (parser, "alpha")
|| gtk_css_parser_has_function (parser, "mix")
|| gtk_css_parser_has_function (parser, "hsl")
|| gtk_css_parser_has_function (parser, "hsla")
|| gtk_css_parser_has_function (parser, "rgb")
|| gtk_css_parser_has_function (parser, "rgba")
|| gtk_css_parser_has_function (parser, "hwb")
|| gtk_css_parser_has_function (parser, "oklab")
|| gtk_css_parser_has_function (parser, "oklch")
|| gtk_css_parser_has_function (parser, "color");
}
typedef struct typedef struct
{ {
GdkRGBA *rgba; GdkRGBA *rgba;

12
gtk/gtkcssnumbervalue.c
View File

@ -1015,11 +1015,11 @@ gtk_css_number_value_multiply (GtkCssValue *value,
break; break;
} }
return gtk_css_math_value_new (TYPE_PRODUCT, 0, return gtk_css_math_value_new (TYPE_PRODUCT, 0,
(GtkCssValue *[]) { (GtkCssValue *[]) {
gtk_css_value_ref (value), gtk_css_value_ref (value),
gtk_css_number_value_new (factor, GTK_CSS_NUMBER) gtk_css_number_value_new (factor, GTK_CSS_NUMBER)
}, 2); }, 2);
} }
GtkCssValue * GtkCssValue *
@ -1314,7 +1314,7 @@ gtk_css_arg2_value_new (guint type,
return gtk_css_dimension_value_new (v, unit); return gtk_css_dimension_value_new (v, unit);
} }
/* This funciton is called at parsing time, so units are not /* This function is called at parsing time, so units are not
* canonical, and length values can't necessarily be unified. * canonical, and length values can't necessarily be unified.
*/ */
GtkCssValue * GtkCssValue *