diff options
author | Matthias Clasen <mclasen@redhat.com> | 2022-01-20 23:59:44 -0500 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2022-01-25 15:29:16 -0500 |
commit | 45762d6b50b29447ee97c759c7a7cc55cb534703 (patch) | |
tree | b3f45c39f4a9d68f03130dd8527f51fc50ef719a /pango/pangoxft-render.c | |
parent | 33eb81450f8572762a5b805cf0bb4740c86f45cf (diff) | |
download | pango-45762d6b50b29447ee97c759c7a7cc55cb534703.tar.gz |
The big rename of doom
simple layout -> layout
line iter -> layout iter
line -> layout line
This commit replaces the old PangoLayout implementation
with PangoSimpleLayout, and does all the necessary
cleanups.
Diffstat (limited to 'pango/pangoxft-render.c')
-rw-r--r-- | pango/pangoxft-render.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/pango/pangoxft-render.c b/pango/pangoxft-render.c index 9228a5c5..714bc5c3 100644 --- a/pango/pangoxft-render.c +++ b/pango/pangoxft-render.c @@ -24,6 +24,7 @@ #include "pangoxft-render.h" #include "pangoxft-private.h" +#include "pango-layout-line-private.h" enum { PROP_0, @@ -718,10 +719,10 @@ release_renderer (PangoRenderer *renderer) */ void pango_xft_render_layout (XftDraw *draw, - XftColor *color, - PangoLayout *layout, - int x, - int y) + XftColor *color, + PangoLayout *layout, + int x, + int y) { PangoContext *context; PangoFontMap *fontmap; @@ -735,7 +736,7 @@ pango_xft_render_layout (XftDraw *draw, fontmap = pango_context_get_font_map (context); renderer = get_renderer (fontmap, draw, color); - pango_renderer_draw_layout (renderer, layout, x, y); + pango_renderer_draw_lines (renderer, pango_layout_get_lines (layout), x, y); release_renderer (renderer); } @@ -755,12 +756,11 @@ pango_xft_render_layout (XftDraw *draw, */ void pango_xft_render_layout_line (XftDraw *draw, - XftColor *color, - PangoLayoutLine *line, - int x, - int y) + XftColor *color, + PangoLayoutLine *line, + int x, + int y) { - PangoContext *context; PangoFontMap *fontmap; PangoRenderer *renderer; @@ -768,8 +768,7 @@ pango_xft_render_layout_line (XftDraw *draw, g_return_if_fail (color != NULL); g_return_if_fail (line != NULL); - context = pango_layout_get_context (line->layout); - fontmap = pango_context_get_font_map (context); + fontmap = pango_context_get_font_map (line->context); renderer = get_renderer (fontmap, draw, color); pango_renderer_draw_layout_line (renderer, line, x, y); |