AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'gtk-3-24' into 'gtk-3-24'

Browse Source 
textview: Add CSS letter spacing [GTK3]

See merge request GNOME/gtk!4254
This commit is contained in:
Matthias Clasen 2021-12-14 18:30:45 +00:00
commit ef95b58500
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk/gtktextview.c
View File

@ -30,6 +30,7 @@
#define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
#include "gtkadjustmentprivate.h" #include "gtkadjustmentprivate.h"
#include "gtkbindings.h" #include "gtkbindings.h"
#include "gtkcssnumbervalueprivate.h"
#include "gtkdnd.h" #include "gtkdnd.h"
#include "gtkdebug.h" #include "gtkdebug.h"
#include "gtkintl.h" #include "gtkintl.h"
@ -7973,10 +7974,12 @@ gtk_text_view_set_attributes_from_style (GtkTextView *text_view,
GtkTextAttributes *values) GtkTextAttributes *values)
{ {
GtkStyleContext *context; GtkStyleContext *context;
GtkCssStyle *style;
GdkRGBA bg_color, fg_color; GdkRGBA bg_color, fg_color;
GtkStateFlags state; GtkStateFlags state;
context = gtk_widget_get_style_context (GTK_WIDGET (text_view)); context = gtk_widget_get_style_context (GTK_WIDGET (text_view));
style = gtk_css_node_get_style (gtk_text_view_get_text_node (text_view));
state = gtk_style_context_get_state (context); state = gtk_style_context_get_state (context);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS G_GNUC_BEGIN_IGNORE_DEPRECATIONS
@ -7995,7 +7998,9 @@ G_GNUC_END_IGNORE_DEPRECATIONS
if (values->font) if (values->font)
pango_font_description_free (values->font); pango_font_description_free (values->font);
gtk_style_context_get (context, state, "font", &values->font, NULL); gtk_style_context_get (context, state, GTK_STYLE_PROPERTY_FONT, &values->font, NULL);
values->letter_spacing = _gtk_css_number_value_get (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_LETTER_SPACING), 100) * PANGO_SCALE;
} }
static void static void