diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-09-04 14:51:41 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-09-04 15:42:05 -0400 |
| commit | 06423d807f8edea6bab2856358af0baaf8175731 (patch) | |
| tree | ac3a90131bae0c750114b6091edc9124f301cd19 /gtk | |
| parent | 363fb96e8134bbd05f40db8f3bd1ac8a7d7ae105 (diff) | |
| download | gtk+-06423d807f8edea6bab2856358af0baaf8175731.tar.gz | |
Revert "gtk: Pass font options along"
This reverts commit 062a15310aefd7feac19a5b7d2c3257d317dfff9.
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gskpango.c | 5 | ||||
| -rw-r--r-- | gtk/gskpango.h | 2 | ||||
| -rw-r--r-- | gtk/gtksnapshot.c | 22 | ||||
| -rw-r--r-- | gtk/gtksnapshotprivate.h | 13 |
4 files changed, 16 insertions, 26 deletions
diff --git a/gtk/gskpango.c b/gtk/gskpango.c index 93aba75f60..e96c84a2fc 100644 --- a/gtk/gskpango.c +++ b/gtk/gskpango.c @@ -100,7 +100,6 @@ gsk_pango_renderer_draw_glyph_item (PangoRenderer *renderer, get_color (crenderer, PANGO_RENDER_PART_FOREGROUND, &color); gtk_snapshot_append_text (crenderer->snapshot, - crenderer->options, glyph_item->item->analysis.font, glyph_item->glyphs, &color, @@ -468,18 +467,14 @@ gtk_snapshot_append_layout (GtkSnapshot *snapshot, const GdkRGBA *color) { GskPangoRenderer *crenderer; - PangoContext *context; g_return_if_fail (snapshot != NULL); g_return_if_fail (PANGO_IS_LAYOUT (layout)); crenderer = gsk_pango_renderer_acquire (); - context = pango_layout_get_context (layout); - crenderer->snapshot = snapshot; crenderer->fg_color = color; - crenderer->options = pango_cairo_context_get_font_options (context); pango_renderer_draw_layout (PANGO_RENDERER (crenderer), layout, 0, 0); diff --git a/gtk/gskpango.h b/gtk/gskpango.h index 05fa2254a0..672128d1c1 100644 --- a/gtk/gskpango.h +++ b/gtk/gskpango.h @@ -63,8 +63,6 @@ struct _GskPangoRenderer /* Error underline color for this widget */ GdkRGBA *error_color; - const cairo_font_options_t *options; - GskPangoRendererState state; guint is_cached_renderer : 1; diff --git a/gtk/gtksnapshot.c b/gtk/gtksnapshot.c index b8d0968c8f..5ebb37f14f 100644 --- a/gtk/gtksnapshot.c +++ b/gtk/gtksnapshot.c @@ -2121,24 +2121,22 @@ gtk_snapshot_render_layout (GtkSnapshot *snapshot, } void -gtk_snapshot_append_text (GtkSnapshot *snapshot, - const cairo_font_options_t *options, - PangoFont *font, - PangoGlyphString *glyphs, - const GdkRGBA *color, - float x, - float y) +gtk_snapshot_append_text (GtkSnapshot *snapshot, + PangoFont *font, + PangoGlyphString *glyphs, + const GdkRGBA *color, + float x, + float y) { GskRenderNode *node; float dx, dy; gtk_snapshot_ensure_translate (snapshot, &dx, &dy); - node = gsk_text_node_new_with_font_options (options, - font, - glyphs, - color, - &GRAPHENE_POINT_INIT (x + dx, y + dy)); + node = gsk_text_node_new (font, + glyphs, + color, + &GRAPHENE_POINT_INIT (x + dx, y + dy)); if (node == NULL) return; diff --git a/gtk/gtksnapshotprivate.h b/gtk/gtksnapshotprivate.h index ca32df1a52..99714c5a99 100644 --- a/gtk/gtksnapshotprivate.h +++ b/gtk/gtksnapshotprivate.h @@ -24,13 +24,12 @@ G_BEGIN_DECLS -void gtk_snapshot_append_text (GtkSnapshot *snapshot, - const cairo_font_options_t *options, - PangoFont *font, - PangoGlyphString *glyphs, - const GdkRGBA *color, - float x, - float y); +void gtk_snapshot_append_text (GtkSnapshot *snapshot, + PangoFont *font, + PangoGlyphString *glyphs, + const GdkRGBA *color, + float x, + float y); void gtk_snapshot_push_collect (GtkSnapshot *snapshot); GskRenderNode * gtk_snapshot_pop_collect (GtkSnapshot *snapshot); |