diff options
| author | Benjamin Otte <otte@redhat.com> | 2010-10-10 08:31:45 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-10-30 01:49:59 +0800 |
| commit | b3a95d0299386bccbdebb967d15f4df02cf15891 (patch) | |
| tree | 52b90e4b913bb1c4cd17df3335216bf518a6e01c /libgnomecanvas/gnome-canvas-line.c | |
| parent | 08e71ba8ae72f333f017c25168b9ec85ea5954fa (diff) | |
| download | gsoc2013-evolution-b3a95d0299386bccbdebb967d15f4df02cf15891.tar gsoc2013-evolution-b3a95d0299386bccbdebb967d15f4df02cf15891.tar.gz gsoc2013-evolution-b3a95d0299386bccbdebb967d15f4df02cf15891.tar.bz2 gsoc2013-evolution-b3a95d0299386bccbdebb967d15f4df02cf15891.tar.lz gsoc2013-evolution-b3a95d0299386bccbdebb967d15f4df02cf15891.tar.xz gsoc2013-evolution-b3a95d0299386bccbdebb967d15f4df02cf15891.tar.zst gsoc2013-evolution-b3a95d0299386bccbdebb967d15f4df02cf15891.zip | |
gnome-canvas: Change GnomeCanvasItem->point vfunc
Previously the function returned the distance to the nearest item. Now
it only returns an item that is hit. This slightly changes semantics
(button events are no longer dispatched to the nearest item, but only to
the item actually clicked on), but makes the code way simpler and
actually does what one would expect.
Diffstat (limited to 'libgnomecanvas/gnome-canvas-line.c')
| -rw-r--r-- | libgnomecanvas/gnome-canvas-line.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/libgnomecanvas/gnome-canvas-line.c b/libgnomecanvas/gnome-canvas-line.c index 4e6364d7e0..20cde8a6d9 100644 --- a/libgnomecanvas/gnome-canvas-line.c +++ b/libgnomecanvas/gnome-canvas-line.c @@ -95,8 +95,8 @@ static void gnome_canvas_line_get_property (GObject *object, static void gnome_canvas_line_update (GnomeCanvasItem *item, gdouble *affine, ArtSVP *clip_path, gint flags); static void gnome_canvas_line_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint width, gint height); -static gdouble gnome_canvas_line_point (GnomeCanvasItem *item, gdouble x, gdouble y, - gint cx, gint cy, GnomeCanvasItem **actual_item); +static GnomeCanvasItem *gnome_canvas_line_point (GnomeCanvasItem *item, gdouble x, gdouble y, + gint cx, gint cy); static void gnome_canvas_line_bounds (GnomeCanvasItem *item, gdouble *x1, gdouble *y1, gdouble *x2, gdouble *y2); static GnomeCanvasItemClass *parent_class; @@ -995,9 +995,9 @@ gnome_canvas_line_draw (GnomeCanvasItem *item, GdkDrawable *drawable, } } -static double +static GnomeCanvasItem * gnome_canvas_line_point (GnomeCanvasItem *item, gdouble x, gdouble y, - gint cx, gint cy, GnomeCanvasItem **actual_item) + gint cx, gint cy) { GnomeCanvasLine *line; gdouble *line_points = NULL, *coords; @@ -1015,8 +1015,6 @@ gnome_canvas_line_point (GnomeCanvasItem *item, gdouble x, gdouble y, line = GNOME_CANVAS_LINE (item); - *actual_item = item; - best = 1.0e36; /* Handle smoothed lines by generating an expanded set ot points */ @@ -1174,7 +1172,7 @@ done: if ((line_points != static_points) && (line_points != line->coords)) g_free (line_points); - return best; + return best == 0.0 ? item : NULL; } static void |