diff options
| author | Benjamin Otte <otte@redhat.com> | 2012-03-30 03:51:25 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2012-04-17 08:59:15 +0200 |
| commit | bf92f2f7ac5ac55b7ae4b59d8cd3a449d9ab5b20 (patch) | |
| tree | f4671a65bcadb948c611079740e23cedfde2f7ee /gtk/gtkcssshorthandpropertyimpl.c | |
| parent | ad05604b3e4716a093f7b2099b1990fb5f13c91a (diff) | |
| download | gtk+-bf92f2f7ac5ac55b7ae4b59d8cd3a449d9ab5b20.tar.gz | |
cssvalue: Do a hacky conversion of font-size to a number value
Just store the value as px for now.
The font-size property needs a complete makeover anyway.
Diffstat (limited to 'gtk/gtkcssshorthandpropertyimpl.c')
| -rw-r--r-- | gtk/gtkcssshorthandpropertyimpl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtkcssshorthandpropertyimpl.c b/gtk/gtkcssshorthandpropertyimpl.c index 05b8fba23d..7bba8786c7 100644 --- a/gtk/gtkcssshorthandpropertyimpl.c +++ b/gtk/gtkcssshorthandpropertyimpl.c @@ -451,7 +451,7 @@ parse_font (GtkCssShorthandProperty *shorthand, } if (mask & PANGO_FONT_MASK_SIZE) { - values[4] = _gtk_css_value_new_from_double ((double) pango_font_description_get_size (desc) / PANGO_SCALE); + values[4] = _gtk_css_number_value_new ((double) pango_font_description_get_size (desc) / PANGO_SCALE, GTK_CSS_PX); } pango_font_description_free (desc); @@ -743,7 +743,7 @@ pack_font_description (GtkCssShorthandProperty *shorthand, v = (* query_func) (_gtk_css_style_property_get_id (GTK_CSS_STYLE_PROPERTY (_gtk_style_property_lookup ("font-size"))), query_data); if (v) - pango_font_description_set_size (description, round (_gtk_css_value_get_double (v) * PANGO_SCALE)); + pango_font_description_set_size (description, round (_gtk_css_number_value_get (v, 100) * PANGO_SCALE)); v = (* query_func) (_gtk_css_style_property_get_id (GTK_CSS_STYLE_PROPERTY (_gtk_style_property_lookup ("font-style"))), query_data); if (v) |