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/gtkcssnumbervalue.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/gtkcssnumbervalue.c')
| -rw-r--r-- | gtk/gtkcssnumbervalue.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gtk/gtkcssnumbervalue.c b/gtk/gtkcssnumbervalue.c index e845a686c6..19e4c1d198 100644 --- a/gtk/gtkcssnumbervalue.c +++ b/gtk/gtkcssnumbervalue.c @@ -173,12 +173,14 @@ _gtk_css_number_value_compute (GtkCssValue *number, GTK_CSS_PX); break; case GTK_CSS_EM: - return _gtk_css_number_value_new (number->value * _gtk_css_value_get_double (_gtk_style_context_peek_property (context, "font-size")), + return _gtk_css_number_value_new (number->value * + _gtk_css_number_value_get (_gtk_style_context_peek_property (context, "font-size"), 100), GTK_CSS_PX); break; case GTK_CSS_EX: /* for now we pretend ex is half of em */ - return _gtk_css_number_value_new (number->value * 0.5 * _gtk_css_value_get_double (_gtk_style_context_peek_property (context, "font-size")), + return _gtk_css_number_value_new (number->value * 0.5 * + _gtk_css_number_value_get (_gtk_style_context_peek_property (context, "font-size"), 100), GTK_CSS_PX); case GTK_CSS_RAD: return _gtk_css_number_value_new (number->value * 360.0 / (2 * G_PI), |