[PATCH] Add emblems to icon view drag icon

[Christian Neumair <chris gnome-de org>]

The attached patch partially fixes bug 159643 [1]:

"Put an emblem on a directory, drag the directory. When dragging the
dir, you can still read the name and view the icon of the directory but
no the emblem."

The attached patch fixes this at least for the icon view. The list view
seems to be more tricky. I was neither able to render a cell renderer to
an offscreen drawable, not could I copy a particular area from the list
view's GdkWindow to a pixbuf. The output just looked crippled, although
it was right in size.
Help appreciated.

[1] http://bugzilla.gnome.org/show_bug.cgi?id=159643

-- 
Christian Neumair <chris gnome-de org>

Index: libnautilus-private/nautilus-icon-canvas-item.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-icon-canvas-item.c,v
retrieving revision 1.191
diff -u -p -r1.191 nautilus-icon-canvas-item.c
--- libnautilus-private/nautilus-icon-canvas-item.c	6 Jul 2005 11:45:08 -0000	1.191
+++ libnautilus-private/nautilus-icon-canvas-item.c	24 Aug 2005 12:26:48 -0000
@@ -467,7 +467,10 @@ nautilus_icon_canvas_item_get_image (Nau
 	int width, height;
 	int item_offset_x, item_offset_y;
 	ArtIRect icon_rect;
+	ArtIRect emblem_rect;
 	GdkPixbuf *pixbuf;
+	GdkPixbuf *emblem_pixbuf;
+	EmblemLayout emblem_layout;
 	double item_x, item_y;
 	
 	g_return_val_if_fail (NAUTILUS_IS_ICON_CANVAS_ITEM (item), NULL);
@@ -496,14 +499,42 @@ nautilus_icon_canvas_item_get_image (Nau
 				 gdk_colormap_get_visual (colormap)->depth);
 	gdk_drawable_set_colormap (GDK_DRAWABLE (pixmap), colormap);
 
-	pixbuf = item->details->pixbuf;
+	pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
+				 TRUE,
+				 gdk_pixbuf_get_bits_per_sample (item->details->pixbuf),
+				 width, height);
+	gdk_pixbuf_fill (pixbuf, 0x00000000);
+
+	gdk_pixbuf_composite (item->details->pixbuf, pixbuf,
+			      item_offset_x, item_offset_y,
+			      gdk_pixbuf_get_width (item->details->pixbuf),
+			      gdk_pixbuf_get_height (item->details->pixbuf),
+			      item_offset_x, item_offset_y, 1.0, 1.0,
+			      GDK_INTERP_BILINEAR, 255);
+
+	icon_rect.x0 = item_offset_x;
+	icon_rect.y0 = item_offset_y;
+	icon_rect.x1 = item_offset_x + gdk_pixbuf_get_width (item->details->pixbuf);
+	icon_rect.y1 = item_offset_y + gdk_pixbuf_get_height (item->details->pixbuf);
+
+	emblem_layout_reset (&emblem_layout, item, icon_rect);
+	while (emblem_layout_next (&emblem_layout, &emblem_pixbuf, &emblem_rect)) {
+		gdk_pixbuf_composite (emblem_pixbuf, pixbuf,
+				      emblem_rect.x0, emblem_rect.y0,
+				      gdk_pixbuf_get_width (emblem_pixbuf),
+				      gdk_pixbuf_get_height (emblem_pixbuf),
+				      emblem_rect.x0, emblem_rect.y0,
+				      1.0, 1.0,
+				      GDK_INTERP_BILINEAR, 255);
+	}
+
 	gc = gdk_gc_new (pixmap);
 	gdk_draw_rectangle (pixmap, GTK_WIDGET (canvas)->style->white_gc,
 			    TRUE,
 			    0, 0,
 			    width, height);
 	gdk_draw_pixbuf (pixmap, gc, pixbuf, 
-			 0, 0, item_offset_x, item_offset_y,
+			 0, 0, 0, 0,
 			 gdk_pixbuf_get_width (pixbuf), gdk_pixbuf_get_height (pixbuf),
 			 GDK_RGB_DITHER_NORMAL,
 			 0, 0);
@@ -520,20 +551,18 @@ nautilus_icon_canvas_item_get_image (Nau
 	g_object_unref (gc);
 	  
 	gdk_pixbuf_render_threshold_alpha (pixbuf, *mask,
-					   0, 0, item_offset_x, item_offset_y,
+					   0, 0, 0, 0,
 					   gdk_pixbuf_get_width (pixbuf), gdk_pixbuf_get_height (pixbuf),
 					   128);
 	
 	draw_embedded_text (item, GDK_DRAWABLE (pixmap),
 			    item_offset_x, item_offset_y);
 
-	icon_rect.x0 = item_offset_x;
-	icon_rect.y0 = item_offset_y;
-	icon_rect.x1 = item_offset_x + gdk_pixbuf_get_width (pixbuf);
-	icon_rect.y1 = item_offset_y + gdk_pixbuf_get_height (pixbuf);
 	draw_label_text (item, GDK_DRAWABLE (pixmap), FALSE, icon_rect);
 	draw_label_text (item, GDK_DRAWABLE (*mask), TRUE, icon_rect);
-	
+
+	gdk_pixbuf_unref (pixbuf);
+
 	return pixmap;
 }

Attachment: signature.asc
Description: This is a digitally signed message part