[Commits] gtkcmctree.c 1.1.2.26 1.1.2.27

[colin at claws-mail.org]

Update of /home/claws-mail/claws/src/gtk
In directory claws-mail:/tmp/cvs-serv8915/src/gtk

Modified Files:
      Tag: gtk2
	gtkcmctree.c 
Log Message:
2012-01-03 [colin]	3.8.0cvs9

	* src/gtk/gtkcmctree.c
		Fix bug #2566, 'wrapped Subject not bounded'

Index: gtkcmctree.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/Attic/gtkcmctree.c,v
retrieving revision 1.1.2.26
retrieving revision 1.1.2.27
diff -u -d -r1.1.2.26 -r1.1.2.27
--- gtkcmctree.c	24 Nov 2011 11:27:16 -0000	1.1.2.26
+++ gtkcmctree.c	3 Jan 2012 17:09:55 -0000	1.1.2.27
@@ -769,7 +769,6 @@
 	  else
 		gdk_cairo_set_source_color(cr, &style->base[state]);
 	  cairo_fill(cr);
-
 	  layout = create_cell_layout (clist, clist_row, i);
 	  if (layout)
 	    {
@@ -855,9 +854,12 @@
 		  if (layout)
 		    {
 		      gint row_center_offset = (clist->row_height - logical_rect.height) / 2;
+		      gdk_cairo_rectangle(cr, &clip_rectangle);
+		      cairo_clip(cr);
 		      gdk_cairo_set_source_color(cr, fgcolor);
 		      cairo_move_to(cr, offset, row_rectangle.y + row_center_offset + clist_row->cell[i].vertical);
 		      pango_cairo_show_layout(cr, layout);
+		      cairo_reset_clip(cr);
 		      g_object_unref (G_OBJECT (layout));
 		    }
 		  break;
@@ -923,10 +925,12 @@
 		offset += GTK_CMCELL_PIXTEXT (clist_row->cell[i])->spacing;
 	    }
 	  
+	  gdk_cairo_rectangle(cr, &clip_rectangle);
+	  cairo_clip(cr);
 	  cairo_move_to(cr, offset, row_rectangle.y + row_center_offset + clist_row->cell[i].vertical);
 	  gdk_cairo_set_source_color(cr, fgcolor);
 	  pango_cairo_show_layout(cr, layout);
-
+	  cairo_reset_clip(cr);
           g_object_unref (G_OBJECT (layout));
 	}
     }