diff options
| author | Owen Taylor <otaylor@redhat.com> | 2004-11-30 14:57:14 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2004-11-30 14:57:14 +0000 |
| commit | 683a00b6e180474b0b9c212c1e71c3276d3032b3 (patch) | |
| tree | 8e96d099f9823eb006c35ab842c907ac8fa70070 /gdk | |
| parent | 6510bbf42ecbcfdb45b4b18a0c27e983ac1c95eb (diff) | |
| download | gtk+-683a00b6e180474b0b9c212c1e71c3276d3032b3.tar.gz | |
gdk/x11/gdkdrawable-x11.c (_gdk_x11_drawable_draw_xtrapezoids) Call
Tue Nov 30 09:46:49 2004 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdrawable-x11.c (_gdk_x11_drawable_draw_xtrapezoids)
* gdk/x11/gdkdrawable-x11.c (_gdk_x11_drawable_draw_xft_glyphs):
Call gdk_x11_drawable_update_xft_clip (part of #159929,
James Henstridge)
* gdk/x11/gdkdrawable-x11.c (gdk_x11_draw_glyphs_transformed):
Remove unused variables.
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/x11/gdkdrawable-x11.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c index 6517f36a56..371f648839 100644 --- a/gdk/x11/gdkdrawable-x11.c +++ b/gdk/x11/gdkdrawable-x11.c @@ -824,18 +824,11 @@ gdk_x11_draw_glyphs_transformed (GdkDrawable *drawable, { GdkDrawableImplX11 *impl; PangoRenderer *renderer; - XftColor color; - XftDraw *draw; impl = GDK_DRAWABLE_IMPL_X11 (drawable); g_return_if_fail (PANGO_XFT_IS_FONT (font)); - _gdk_gc_x11_get_fg_xft_color (gc, &color); - - gdk_x11_drawable_update_xft_clip (drawable, gc); - draw = gdk_x11_drawable_get_xft_draw (drawable); - renderer = _gdk_x11_renderer_get (drawable, gc); if (matrix) pango_renderer_set_matrix (renderer, matrix); @@ -1635,6 +1628,7 @@ _gdk_x11_drawable_draw_xtrapezoids (GdkDrawable *drawable, return; } + gdk_x11_drawable_update_xft_clip (drawable, gc); draw = gdk_x11_drawable_get_xft_draw (drawable); if (!x11display->mask_format) @@ -1659,8 +1653,10 @@ _gdk_x11_drawable_draw_xft_glyphs (GdkDrawable *drawable, GdkScreen *screen = GDK_DRAWABLE_IMPL_X11 (drawable)->screen; GdkDisplay *display = gdk_screen_get_display (screen); GdkDisplayX11 *x11display = GDK_DISPLAY_X11 (display); + XftDraw *draw; - XftDraw *draw = gdk_x11_drawable_get_xft_draw (drawable); + gdk_x11_drawable_update_xft_clip (drawable, gc); + draw = gdk_x11_drawable_get_xft_draw (drawable); if (_gdk_x11_have_render (display)) { |