AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a typo

Browse Source 
The property is called font-variant-alternates, not -alternatives.
Correct this everywhere.
This commit is contained in:
Matthias Clasen 2017-09-18 18:10:08 -04:00
parent 92398bb1bb
commit f87dc24867
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtkcssshorthandpropertyimpl.c
View File

@ -1272,7 +1272,7 @@ _gtk_css_shorthand_property_init_properties (void)
const char *animation_subproperties[] = { "animation-name", "animation-iteration-count", "animation-duration", "animation-delay",
"animation-timing-function", "animation-direction", "animation-fill-mode", NULL };
const char *text_decoration_subproperties[] = { "text-decoration-line", "text-decoration-style", "text-decoration-color", NULL };
const char *font_variant_subproperties[] = { "font-variant-ligatures", "font-variant-position", "font-variant-caps", "font-variant-numeric", "font-variant-alternatives", "font-variant-east-asian", NULL };
const char *font_variant_subproperties[] = { "font-variant-ligatures", "font-variant-position", "font-variant-caps", "font-variant-numeric", "font-variant-alternates", "font-variant-east-asian", NULL };
const char **all_subproperties;

8
gtk/gtkcssstyle.c
View File

@ -230,7 +230,7 @@ gtk_css_style_get_pango_attributes (GtkCssStyle *style)
GtkCssValue *position;
GtkCssValue *caps;
GtkCssValue *numeric;
GtkCssValue *alternatives;
GtkCssValue *alternates;
GtkCssValue *east_asian;
GString *s;
int i;
@ -371,10 +371,10 @@ gtk_css_style_get_pango_attributes (GtkCssStyle *style)
g_string_append (s, "zero 1");
}
alternatives = gtk_css_style_get_value (style, GTK_CSS_PROPERTY_FONT_VARIANT_ALTERNATIVES);
for (i = 0; i < _gtk_css_array_value_get_n_values (alternatives); i++)
alternates = gtk_css_style_get_value (style, GTK_CSS_PROPERTY_FONT_VARIANT_ALTERNATES);
for (i = 0; i < _gtk_css_array_value_get_n_values (alternates); i++)
{
GtkCssValue *value = _gtk_css_array_value_get_nth (alternatives, i);
GtkCssValue *value = _gtk_css_array_value_get_nth (alternates, i);
if (s->len > 0) g_string_append (s, ", ");
if (strcmp (_gtk_css_ident_value_get (value), "historical-forms") == 0)
g_string_append (s, "hist 1");

10
gtk/gtkcssstylepropertyimpl.c
View File

@ -716,8 +716,8 @@ parse_font_variant_numeric (GtkCssStyleProperty *property,
}
static GtkCssValue *
parse_font_variant_alternatives (GtkCssStyleProperty *property,
GtkCssParser *parser)
parse_font_variant_alternates (GtkCssStyleProperty *property,
GtkCssParser *parser)
{
GtkCssValue *value = NULL;
@ -1307,12 +1307,12 @@ _gtk_css_style_property_init_properties (void)
parse_font_variant_numeric,
NULL,
_gtk_css_array_value_new (_gtk_css_ident_value_new ("normal")));
gtk_css_style_property_register ("font-variant-alternatives",
GTK_CSS_PROPERTY_FONT_VARIANT_ALTERNATIVES,
gtk_css_style_property_register ("font-variant-alternates",
GTK_CSS_PROPERTY_FONT_VARIANT_ALTERNATES,
G_TYPE_NONE,
0,
GTK_CSS_AFFECTS_TEXT | GTK_CSS_AFFECTS_TEXT_ATTRS,
parse_font_variant_alternatives,
parse_font_variant_alternates,
NULL,
_gtk_css_array_value_new (_gtk_css_ident_value_new ("normal")));
gtk_css_style_property_register ("font-variant-east-asian",

2
gtk/gtkcsstypesprivate.h
View File

@ -167,7 +167,7 @@ enum { /*< skip >*/
GTK_CSS_PROPERTY_FONT_VARIANT_POSITION,
GTK_CSS_PROPERTY_FONT_VARIANT_CAPS,
GTK_CSS_PROPERTY_FONT_VARIANT_NUMERIC,
GTK_CSS_PROPERTY_FONT_VARIANT_ALTERNATIVES,
GTK_CSS_PROPERTY_FONT_VARIANT_ALTERNATES,
GTK_CSS_PROPERTY_FONT_VARIANT_EAST_ASIAN,
GTK_CSS_PROPERTY_TEXT_SHADOW,
GTK_CSS_PROPERTY_BOX_SHADOW,