From c80e877c28f292081faa205c28ded90649a4147f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 18 Oct 2021 16:45:10 -0400 Subject: [PATCH] css: Fix handling of percentage for line-height We weren't doing the right thing here. This is simpler, and works. Fixes: #4354 --- gtk/gtkcsslineheightvalue.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/gtk/gtkcsslineheightvalue.c b/gtk/gtkcsslineheightvalue.c index c9104cee24..4472f503bc 100644 --- a/gtk/gtkcsslineheightvalue.c +++ b/gtk/gtkcsslineheightvalue.c @@ -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;