[gtk/css-line-height: 4/4] textview: Use line-height from css
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/css-line-height: 4/4] textview: Use line-height from css
- Date: Fri, 6 Aug 2021 18:37:05 +0000 (UTC)
commit be8cbb2adb134a6f444e5d6a43555f1f065f00aa
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Aug 6 14:35:48 2021 -0400
textview: Use line-height from css
Pass the line height from the style on to the
text attributes.
gtk/gtktextview.c | 9 +++++++++
1 file changed, 9 insertions(+)
---
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index d6673bed62..6a77e9542d 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -57,6 +57,7 @@
#include "gtknative.h"
#include "gtkwidgetprivate.h"
#include "gtkjoinedmenuprivate.h"
+#include "gtkcssstylepropertyprivate.h"
/**
* GtkTextView:
@@ -7640,6 +7641,7 @@ gtk_text_view_set_attributes_from_style (GtkTextView *text_view,
GtkTextAttributes *values)
{
GtkCssStyle *style;
+ GtkCssStyleProperty *prop;
const GdkRGBA black = { 0, };
const GdkRGBA *color;
@@ -7659,6 +7661,13 @@ gtk_text_view_set_attributes_from_style (GtkTextView *text_view,
pango_font_description_free (values->font);
values->font = gtk_css_style_get_pango_font (style);
+
+ prop = _gtk_css_style_property_lookup_by_id (GTK_CSS_PROPERTY_LINE_HEIGHT);
+
+ if (style->font->line_height == _gtk_css_style_property_get_initial_value (prop))
+ values->line_spacing = 0.0;
+ else
+ values->line_spacing = _gtk_css_number_value_get (style->font->line_height, 1.0);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]