diff options
| author | Alexander Larsson <alexl@redhat.com> | 2004-10-22 15:44:16 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2004-10-22 15:44:16 +0000 |
| commit | b1f357b9df69887d9d9dc179ed586c2410e7853f (patch) | |
| tree | 84ce9de6aab3b52a71bcdfc6709951c6424ce3d0 /libnautilus-private/nautilus-icon-dnd.c | |
| parent | 542eede295290eb1c0042c9d118d74bcbc8d529d (diff) | |
| download | nautilus-b1f357b9df69887d9d9dc179ed586c2410e7853f.tar.gz | |
Make the nautilus_icon_canvas_item_get_image return an image containing
2004-10-22 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-icon-canvas-item.c:
(nautilus_icon_canvas_item_get_image), (draw_frame),
(draw_or_measure_label_text), (measure_label_text),
(draw_label_text), (draw_mask), (nautilus_icon_canvas_item_draw):
Make the nautilus_icon_canvas_item_get_image return an image containing
icon + text. The image "start" changed to being from the item position to
from the item boundary.
* libnautilus-private/nautilus-icon-dnd.c:
(nautilus_icon_dnd_begin_drag):
Calculate icon offset from the boundary instead of icon position.
Diffstat (limited to 'libnautilus-private/nautilus-icon-dnd.c')
| -rw-r--r-- | libnautilus-private/nautilus-icon-dnd.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/libnautilus-private/nautilus-icon-dnd.c b/libnautilus-private/nautilus-icon-dnd.c index e8aa4c5c5..e4e0a8eb4 100644 --- a/libnautilus-private/nautilus-icon-dnd.c +++ b/libnautilus-private/nautilus-icon-dnd.c @@ -1236,8 +1236,7 @@ nautilus_icon_dnd_begin_drag (NautilusIconContainer *container, GdkPixmap *pixmap; GdkBitmap *mask; int x_offset, y_offset; - ArtDRect world_rect; - ArtIRect widget_rect; + double x1, y1, x2, y2, winx, winy; g_return_if_fail (NAUTILUS_IS_ICON_CONTAINER (container)); g_return_if_fail (event != NULL); @@ -1260,14 +1259,11 @@ nautilus_icon_dnd_begin_drag (NautilusIconContainer *container, to it, with the hope that we get it back someday as X Windows improves */ /* compute the image's offset */ - world_rect = nautilus_icon_canvas_item_get_icon_rectangle - (container->details->drag_icon->item); - - canvas_rect_world_to_widget (EEL_CANVAS (container), - &world_rect, &widget_rect); - - x_offset = dnd_info->drag_info.start_x - widget_rect.x0; - y_offset = dnd_info->drag_info.start_y - widget_rect.y0; + eel_canvas_item_get_bounds (EEL_CANVAS_ITEM (container->details->drag_icon->item), + &x1, &y1, &x2, &y2); + eel_canvas_world_to_window (canvas, x1, y1, &winx, &winy); + x_offset = start_x - winx; + y_offset = start_y - winy; /* start the drag */ context = gtk_drag_begin (GTK_WIDGET (container), |