From df70b76a554a94335e14ede2d7cbc5e1ec7fd7d6 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Fri, 8 Oct 2010 15:22:50 +0200 Subject: gnome-canvas: Remove aa code The anti-aliased code was never used, so remove it. --- widgets/misc/e-canvas-background.c | 7 ++----- widgets/text/e-text.c | 39 ++++++++++++++++++-------------------- 2 files changed, 20 insertions(+), 26 deletions(-) (limited to 'widgets') diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c index eba6d32659..e062e16dfa 100644 --- a/widgets/misc/e-canvas-background.c +++ b/widgets/misc/e-canvas-background.c @@ -271,9 +271,7 @@ ecb_set_property (GObject *object, if (item->flags & GNOME_CANVAS_ITEM_REALIZED) { get_color (ecb); - if (!item->canvas->aa) { - gdk_gc_set_foreground (ecb->priv->gc, &ecb->priv->color); - } + gdk_gc_set_foreground (ecb->priv->gc, &ecb->priv->color); } } @@ -349,8 +347,7 @@ ecb_realize (GnomeCanvasItem *item) ecb->priv->gc = gdk_gc_new (bin_window); get_color (ecb); - if (!item->canvas->aa) - gdk_gc_set_foreground (ecb->priv->gc, &ecb->priv->color); + gdk_gc_set_foreground (ecb->priv->gc, &ecb->priv->color); set_stipple (ecb, NULL, FALSE); diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index 9946cab16c..9ee330ee5d 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -973,8 +973,7 @@ e_text_set_property (GObject *object, text->color = color; gdk_rgb_find_color (colormap, &text->color); - if (!item->canvas->aa) - set_text_gc_foreground (text); + set_text_gc_foreground (text); text->needs_redraw = 1; needs_update = 1; @@ -1181,25 +1180,23 @@ e_text_update (GnomeCanvasItem *item, gdouble *affine, ArtSVP *clip_path, gint f if ( text->needs_recalc_bounds || (flags & GNOME_CANVAS_UPDATE_AFFINE)) { - if (!item->canvas->aa) { - set_text_gc_foreground (text); - set_stipple (text, text->stipple, TRUE); - get_bounds (text, &x1, &y1, &x2, &y2); - if ( item->x1 != x1 || - item->x2 != x2 || - item->y1 != y1 || - item->y2 != y2 ) { - gnome_canvas_request_redraw (item->canvas, item->x1, item->y1, item->x2, item->y2); - item->x1 = x1; - item->y1 = y1; - item->x2 = x2; - item->y2 = y2; - text->needs_redraw = 1; - item->canvas->need_repick = TRUE; - } - if (!text->fill_clip_rectangle) - item->canvas->need_repick = TRUE; - } + set_text_gc_foreground (text); + set_stipple (text, text->stipple, TRUE); + get_bounds (text, &x1, &y1, &x2, &y2); + if ( item->x1 != x1 || + item->x2 != x2 || + item->y1 != y1 || + item->y2 != y2 ) { + gnome_canvas_request_redraw (item->canvas, item->x1, item->y1, item->x2, item->y2); + item->x1 = x1; + item->y1 = y1; + item->x2 = x2; + item->y2 = y2; + text->needs_redraw = 1; + item->canvas->need_repick = TRUE; + } + if (!text->fill_clip_rectangle) + item->canvas->need_repick = TRUE; text->needs_recalc_bounds = 0; } if (text->needs_redraw) { -- cgit