Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'line-height-percentage' into 'master'

Browse Source 
css: Fix handling of percentage for line-height

Closes #3254 and #4354

See merge request GNOME/gtk!4075
This commit is contained in:
Matthias Clasen
2021-10-19 02:41:09 +00:00
parent 9965f26d97 c80e877c28
commit 464f76ce5d
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtkcsslineheightvalue.c
View File

@@ -52,19 +52,11 @@ gtk_css_value_line_height_compute (GtkCssValue *value,
if (gtk_css_number_value_get_dimension (height) == GTK_CSS_DIMENSION_PERCENTAGE)
{
double factor;
GtkCssValue *val;
GtkCssValue *computed;
factor = _gtk_css_number_value_get (height, 1);
val = gtk_css_dimension_value_new (factor, GTK_CSS_EM);
factor = _gtk_css_number_value_get (height, 1);
computed = gtk_css_number_value_multiply (style->core->font_size, factor);
computed = _gtk_css_value_compute (val,
GTK_CSS_PROPERTY_FONT_SIZE,
provider,
style,
parent_style);
_gtk_css_value_unref (val);
_gtk_css_value_unref (height);
return computed;