[maemo-commits] [maemo-commits] r13616 - in projects/haf/trunk/sapwood: . src

[From: subversion at stage.maemo.org]

Author: tko
Date: 2007-09-05 17:32:50 +0300 (Wed, 05 Sep 2007)
New Revision: 13616

Modified:
   projects/haf/trunk/sapwood/ChangeLog
   projects/haf/trunk/sapwood/src/sapwood-render.c
Log:
Fix clipping in menus.

2007-09-05  Tommi Komulainen  <tommi.komulainen at nokia.com>

	* src/sapwood-render.c (theme_pixbuf_render): When limiting the mask
	to (smaller) clip rectangle, *really* calculate the mask offset
	correctly. Fixes clipping in menus.


Modified: projects/haf/trunk/sapwood/ChangeLog
===================================================================
--- projects/haf/trunk/sapwood/ChangeLog	2007-09-05 14:32:47 UTC (rev 13615)
+++ projects/haf/trunk/sapwood/ChangeLog	2007-09-05 14:32:50 UTC (rev 13616)
@@ -1,5 +1,11 @@
 2007-09-05  Tommi Komulainen  <tommi.komulainen at nokia.com>
 
+	* src/sapwood-render.c (theme_pixbuf_render): When limiting the mask
+	to (smaller) clip rectangle, *really* calculate the mask offset
+	correctly. Fixes clipping in menus.
+
+2007-09-05  Tommi Komulainen  <tommi.komulainen at nokia.com>
+
 	* src/sapwood-pixmap.c (sapwood_pixmap_get_for_file): Trap and
 	print X errors individually to help debugging.
 

Modified: projects/haf/trunk/sapwood/src/sapwood-render.c
===================================================================
--- projects/haf/trunk/sapwood/src/sapwood-render.c	2007-09-05 14:32:47 UTC (rev 13615)
+++ projects/haf/trunk/sapwood/src/sapwood-render.c	2007-09-05 14:32:50 UTC (rev 13616)
@@ -329,14 +329,14 @@
 	       */
 	      if (clip_rect->width < mask_width)
 		{
-		  LOG("width: %d -> %d", mask_width, clip_rect->width);
-		  mask_x = -clip_rect->x;
+		  LOG("width: %d -> %d, x: %d - %d", mask_width, clip_rect->width, x, clip_rect->x);
+		  mask_x = x - clip_rect->x;
 		  mask_width = clip_rect->width;
 		}
 	      if (clip_rect->height < height)
 		{
-		  LOG("height: %d -> %d", mask_height, clip_rect->height);
-		  mask_y = -clip_rect->y;
+		  LOG("height: %d -> %d, y: %d - %d", mask_height, clip_rect->height, y, clip_rect->y);
+		  mask_y = y - clip_rect->y;
 		  mask_height = clip_rect->height;
 		}
 	    }