AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-26 21:51:08 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Fixes gtk_widget_override_font() not behaving properly since commit
df08fc91bd.

https://bugzilla.gnome.org/show_bug.cgi?id=768902
This commit is contained in:
Benjamin Otte 2016-07-28 11:41:21 -04:00
parent f422208040
commit 5ccc0e40f5
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkcssshorthandpropertyimpl.c
View File

@ -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);