diff options
| author | Benjamin Otte <otte@redhat.com> | 2010-10-17 20:15:07 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-10-30 01:50:01 +0800 |
| commit | 8811cd67d3643f5fcdc46ea787ccab8bfbe2cf3c (patch) | |
| tree | ea7ed366b9288173e7e6cbc8cd3766cfad31f1ba /widgets/text | |
| parent | 7fe898ab0f07b516b6472a78ea1583c4cf014233 (diff) | |
| download | gsoc2013-evolution-8811cd67d3643f5fcdc46ea787ccab8bfbe2cf3c.tar.gz gsoc2013-evolution-8811cd67d3643f5fcdc46ea787ccab8bfbe2cf3c.tar.zst gsoc2013-evolution-8811cd67d3643f5fcdc46ea787ccab8bfbe2cf3c.zip | |
gnome-canvas: Convert canvas item transformation matrix to cairo
Also update the GnomeCanvasItem.update vfunc to take a cairo_matrix_t
and no longer pass the clip_path (what was it used for anyway?).
Diffstat (limited to 'widgets/text')
| -rw-r--r-- | widgets/text/e-reflow.c | 6 | ||||
| -rw-r--r-- | widgets/text/e-text.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/widgets/text/e-reflow.c b/widgets/text/e-reflow.c index 4974fd8f04..88e3a89a8b 100644 --- a/widgets/text/e-reflow.c +++ b/widgets/text/e-reflow.c @@ -42,7 +42,7 @@ static void e_reflow_realize (GnomeCanvasItem *item); static void e_reflow_unrealize (GnomeCanvasItem *item); static void e_reflow_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint width, gint height); -static void e_reflow_update (GnomeCanvasItem *item, gdouble affine[6], ArtSVP *clip_path, gint flags); +static void e_reflow_update (GnomeCanvasItem *item, const cairo_matrix_t *i2c, gint flags); static GnomeCanvasItem *e_reflow_point (GnomeCanvasItem *item, gdouble x, gdouble y, gint cx, gint cy); static void e_reflow_reflow (GnomeCanvasItem *item, gint flags); static void set_empty (EReflow *reflow); @@ -1258,7 +1258,7 @@ static void e_reflow_draw (GnomeCanvasItem *item, GdkDrawable *drawable, } static void -e_reflow_update (GnomeCanvasItem *item, gdouble affine[6], ArtSVP *clip_path, gint flags) +e_reflow_update (GnomeCanvasItem *item, const cairo_matrix_t *i2c, gint flags) { EReflow *reflow; gdouble x0, x1, y0, y1; @@ -1266,7 +1266,7 @@ e_reflow_update (GnomeCanvasItem *item, gdouble affine[6], ArtSVP *clip_path, gi reflow = E_REFLOW (item); if (GNOME_CANVAS_ITEM_CLASS (e_reflow_parent_class)->update) - GNOME_CANVAS_ITEM_CLASS (e_reflow_parent_class)->update (item, affine, clip_path, flags); + GNOME_CANVAS_ITEM_CLASS (e_reflow_parent_class)->update (item, i2c, flags); x0 = item->x1; y0 = item->y1; diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index 2f3e567a4a..a21bde7d8b 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -1131,7 +1131,7 @@ e_text_reflow (GnomeCanvasItem *item, gint flags) /* Update handler for the text item */ static void -e_text_update (GnomeCanvasItem *item, gdouble *affine, ArtSVP *clip_path, gint flags) +e_text_update (GnomeCanvasItem *item, const cairo_matrix_t *i2c, gint flags) { EText *text; gdouble x1, y1, x2, y2; @@ -1140,7 +1140,7 @@ e_text_update (GnomeCanvasItem *item, gdouble *affine, ArtSVP *clip_path, gint f if (GNOME_CANVAS_ITEM_CLASS (e_text_parent_class)->update) GNOME_CANVAS_ITEM_CLASS (e_text_parent_class)->update ( - item, affine, clip_path, flags); + item, i2c, flags); if ( text->needs_recalc_bounds || (flags & GNOME_CANVAS_UPDATE_AFFINE)) { |