callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CSS: Handle unknown resolution

Browse Source 
gdk_screen_get_resolution() can return -1 when the resolution is
unknown. Catch that case and use the default resolution of 96, like in
every other case.

Fixes #2119
This commit is contained in:
Benjamin Otte
2019-09-24 22:37:48 +02:00
parent 5d23819c69
commit bdb96507bd
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gtk/gtkcssshorthandpropertyimpl.c
View File

@ -1118,7 +1118,12 @@ unpack_font_description (GtkCssShorthandProperty *shorthand,
g_value_init (&v, G_TYPE_DOUBLE); g_value_init (&v, G_TYPE_DOUBLE);
size = pango_font_description_get_size (description) / PANGO_SCALE; size = pango_font_description_get_size (description) / PANGO_SCALE;
if (!pango_font_description_get_size_is_absolute (description)) if (!pango_font_description_get_size_is_absolute (description))
size = size * gdk_screen_get_resolution (gdk_screen_get_default ()) / 72.0; {
double dpi = gdk_screen_get_resolution (gdk_screen_get_default ());
if (dpi <= 0.0)
dpi = 96.0;
size = size * dpi / 72.0;
}
g_value_set_double (&v, size); g_value_set_double (&v, size);
prop = _gtk_style_property_lookup ("font-size"); prop = _gtk_style_property_lookup ("font-size");
_gtk_style_property_assign (prop, props, state, &v); _gtk_style_property_assign (prop, props, state, &v);