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

stylecontext: Remove get_pango_attributes

Browse Source 
Make the only caller use GtkCssNode API.
This commit is contained in:
Timm Bäder 2020-04-12 09:46:03 +02:00
parent 584a71ae96
commit 21ac2330af
3 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkstylecontext.c
View File

@ -1408,12 +1408,6 @@ gtk_snapshot_render_insertion_cursor (GtkSnapshot *snapshot,
} }
} }
PangoAttrList *
_gtk_style_context_get_pango_attributes (GtkStyleContext *context)
{
return gtk_css_style_get_pango_attributes (gtk_style_context_lookup_style (context));
}
static AtkAttributeSet * static AtkAttributeSet *
add_attribute (AtkAttributeSet *attributes, add_attribute (AtkAttributeSet *attributes,
AtkTextAttribute attr, AtkTextAttribute attr,

2
gtk/gtkstylecontextprivate.h
View File

@ -53,8 +53,6 @@ void _gtk_style_context_get_cursor_color (GtkStyleContext
GdkRGBA *primary_color, GdkRGBA *primary_color,
GdkRGBA *secondary_color); GdkRGBA *secondary_color);
PangoAttrList *_gtk_style_context_get_pango_attributes (GtkStyleContext *context);
/* Accessibility support */ /* Accessibility support */
AtkAttributeSet *_gtk_style_context_get_attributes (AtkAttributeSet *attributes, AtkAttributeSet *_gtk_style_context_get_attributes (AtkAttributeSet *attributes,
GtkStyleContext *context); GtkStyleContext *context);

5
gtk/gtktext.c
View File

@ -4334,7 +4334,6 @@ gtk_text_create_layout (GtkText *self,
{ {
GtkTextPrivate *priv = gtk_text_get_instance_private (self); GtkTextPrivate *priv = gtk_text_get_instance_private (self);
GtkWidget *widget = GTK_WIDGET (self); GtkWidget *widget = GTK_WIDGET (self);
GtkStyleContext *context;
PangoLayout *layout; PangoLayout *layout;
PangoAttrList *tmp_attrs; PangoAttrList *tmp_attrs;
char *preedit_string = NULL; char *preedit_string = NULL;
@ -4343,12 +4342,10 @@ gtk_text_create_layout (GtkText *self,
char *display_text; char *display_text;
guint n_bytes; guint n_bytes;
context = gtk_widget_get_style_context (widget);
layout = gtk_widget_create_pango_layout (widget, NULL); layout = gtk_widget_create_pango_layout (widget, NULL);
pango_layout_set_single_paragraph_mode (layout, TRUE); pango_layout_set_single_paragraph_mode (layout, TRUE);
tmp_attrs = _gtk_style_context_get_pango_attributes (context); tmp_attrs = gtk_css_style_get_pango_attributes (gtk_css_node_get_style (gtk_widget_get_css_node (widget)));
tmp_attrs = _gtk_pango_attr_list_merge (tmp_attrs, priv->attrs); tmp_attrs = _gtk_pango_attr_list_merge (tmp_attrs, priv->attrs);
if (!tmp_attrs) if (!tmp_attrs)
tmp_attrs = pango_attr_list_new (); tmp_attrs = pango_attr_list_new ();