From 5cc2615a37ebd621954d386639ae261165bc09ef Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 15 Jan 2011 11:52:43 -0500 Subject: Remove some unused gnome-canvas options. Simplifies the drawing code a bit. Public API removed: GnomeCanvas.center_scroll_region (is always TRUE) GnomeCanvas.pixels_per_unit (is always 1.0) gnome_canvas_set_center_scroll_region() gnome_canvas_get_center_scroll_region() gnome_canvas_set_pixels_per_unit() --- libgnomecanvas/gnome-canvas-widget.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'libgnomecanvas/gnome-canvas-widget.c') diff --git a/libgnomecanvas/gnome-canvas-widget.c b/libgnomecanvas/gnome-canvas-widget.c index d6ac27c447..b97910276b 100644 --- a/libgnomecanvas/gnome-canvas-widget.c +++ b/libgnomecanvas/gnome-canvas-widget.c @@ -388,13 +388,8 @@ gnome_canvas_widget_update (GnomeCanvasItem *item, (* parent_class->update) (item, matrix, flags); if (witem->widget) { - if (witem->size_pixels) { - witem->cwidth = (gint) (witem->width + 0.5); - witem->cheight = (gint) (witem->height + 0.5); - } else { - witem->cwidth = (gint) (witem->width * item->canvas->pixels_per_unit + 0.5); - witem->cheight = (gint) (witem->height * item->canvas->pixels_per_unit + 0.5); - } + witem->cwidth = (gint) (witem->width + 0.5); + witem->cheight = (gint) (witem->height + 0.5); gtk_widget_set_size_request (witem->widget, witem->cwidth, witem->cheight); } else { @@ -432,8 +427,8 @@ gnome_canvas_widget_point (GnomeCanvasItem *item, gdouble x, gdouble y, gnome_canvas_c2w (item->canvas, witem->cx, witem->cy, &x1, &y1); - x2 = x1 + (witem->cwidth - 1) / item->canvas->pixels_per_unit; - y2 = y1 + (witem->cheight - 1) / item->canvas->pixels_per_unit; + x2 = x1 + (witem->cwidth - 1); + y2 = y1 + (witem->cheight - 1); /* Is point inside widget bounds? */ -- cgit v1.2.3