diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-01-16 00:52:43 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-01-16 01:11:31 +0800 |
| commit | d1b440a268b6f43f86114df12b543f7e7c6d6588 (patch) | |
| tree | 8717cb7ffa86737f3344917062bacdc746e570bd /libgnomecanvas/gnome-canvas-widget.c | |
| parent | a4d8c30310cfcd95a54153930336ff8196adde76 (diff) | |
| download | gsoc2013-evolution-d1b440a268b6f43f86114df12b543f7e7c6d6588.tar.gz gsoc2013-evolution-d1b440a268b6f43f86114df12b543f7e7c6d6588.tar.zst gsoc2013-evolution-d1b440a268b6f43f86114df12b543f7e7c6d6588.zip | |
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()
Diffstat (limited to 'libgnomecanvas/gnome-canvas-widget.c')
| -rw-r--r-- | libgnomecanvas/gnome-canvas-widget.c | 13 |
1 files changed, 4 insertions, 9 deletions
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? */ |