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

css: Properly convert em, ex and rem to pixels

Browse Source 
The previous code converted to pt.
This commit is contained in:
Benjamin Otte
2016-02-05 14:42:41 +01:00
parent 56b1b08bb8
commit e35e6abbb2
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gtk/gtkcssnumbervalue.c
View File

@ -127,16 +127,17 @@ gtk_css_value_number_compute (GtkCssValue *number,
return _gtk_css_number_value_new (number->value * 96.0 * 0.039370078740157477, return _gtk_css_number_value_new (number->value * 96.0 * 0.039370078740157477,
GTK_CSS_PX); GTK_CSS_PX);
case GTK_CSS_EM: case GTK_CSS_EM:
return _gtk_css_number_value_new (number->value * return _gtk_css_number_value_new (number->value * 96.0 / 72.0 *
get_base_font_size (property_id, provider, style, parent_style), get_base_font_size (property_id, provider, style, parent_style),
GTK_CSS_PX); GTK_CSS_PX);
case GTK_CSS_EX: case GTK_CSS_EX:
/* for now we pretend ex is half of em */ /* for now we pretend ex is half of em */
return _gtk_css_number_value_new (number->value * 0.5 * return _gtk_css_number_value_new (number->value * 0.5 * 96.0 / 72.0 *
get_base_font_size (property_id, provider, style, parent_style), get_base_font_size (property_id, provider, style, parent_style),
GTK_CSS_PX); GTK_CSS_PX);
case GTK_CSS_REM: case GTK_CSS_REM:
return _gtk_css_number_value_new (number->value * _gtk_css_font_size_get_default (provider), return _gtk_css_number_value_new (number->value * 96.0 / 72.0 *
_gtk_css_font_size_get_default (provider),
GTK_CSS_PX); GTK_CSS_PX);
case GTK_CSS_RAD: case GTK_CSS_RAD:
return _gtk_css_number_value_new (number->value * 360.0 / (2 * G_PI), return _gtk_css_number_value_new (number->value * 360.0 / (2 * G_PI),