Commit 5ccc0e40 authored by Benjamin Otte's avatar Benjamin Otte

css: Fix case where we didn't convert pt => px

Fixes gtk_widget_override_font() not behaving properly since commit
df08fc91.

https://bugzilla.gnome.org/show_bug.cgi?id=768902
parent f4222080
......@@ -1113,9 +1113,13 @@ unpack_font_description (GtkCssShorthandProperty *shorthand,
if (mask & PANGO_FONT_MASK_SIZE)
{
g_value_init (&v, G_TYPE_DOUBLE);
g_value_set_double (&v, (double) pango_font_description_get_size (description) / PANGO_SCALE);
double size;
g_value_init (&v, G_TYPE_DOUBLE);
size = pango_font_description_get_size (description) / PANGO_SCALE;
if (!pango_font_description_get_size_is_absolute (description))
size = size * 96.0 / 72.0;
g_value_set_double (&v, size);
prop = _gtk_style_property_lookup ("font-size");
_gtk_style_property_assign (prop, props, state, &v);
g_value_unset (&v);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment