[maemo-commits] [maemo-commits] r19240 - in projects/haf/branches/sapwood/rgb-only: . engine

[From: subversion at stage.maemo.org]

Author: herzi
Date: 2009-08-28 15:53:36 +0300 (Fri, 28 Aug 2009)
New Revision: 19240

Modified:
   projects/haf/branches/sapwood/rgb-only/ChangeLog
   projects/haf/branches/sapwood/rgb-only/engine/sapwood-pixmap.c
Log:
2009-08-25 Sven Herzberg <sven at lanedo.com>

	Fixes: NB#134552 (Progress Banner at start of maps and tutorial applet
	is broken)

	* engine/sapwood-pixmap.c (sapwood_crop_pixmap),
	(sapwood_pixmap_render_rects): don't respect the mask too early


Modified: projects/haf/branches/sapwood/rgb-only/ChangeLog
===================================================================
--- projects/haf/branches/sapwood/rgb-only/ChangeLog	2009-08-28 12:53:22 UTC (rev 19239)
+++ projects/haf/branches/sapwood/rgb-only/ChangeLog	2009-08-28 12:53:36 UTC (rev 19240)
@@ -1,6 +1,14 @@
 2009-08-25  Sven Herzberg  <sven at lanedo.com>
 
 	Fixes: NB#134552 (Progress Banner at start of maps and tutorial applet
+	is broken)
+
+	* engine/sapwood-pixmap.c (sapwood_crop_pixmap),
+	(sapwood_pixmap_render_rects): don't respect the mask too early
+
+2009-08-25  Sven Herzberg  <sven at lanedo.com>
+
+	Fixes: NB#134552 (Progress Banner at start of maps and tutorial applet
 	is broken.)
 
 	* engine/sapwood-pixmap.c (sapwood_pixmap_render_rects_internal),

Modified: projects/haf/branches/sapwood/rgb-only/engine/sapwood-pixmap.c
===================================================================
--- projects/haf/branches/sapwood/rgb-only/engine/sapwood-pixmap.c	2009-08-28 12:53:22 UTC (rev 19239)
+++ projects/haf/branches/sapwood/rgb-only/engine/sapwood-pixmap.c	2009-08-28 12:53:36 UTC (rev 19240)
@@ -395,7 +395,16 @@
           cairo_pattern_set_matrix (pattern,
                                     &matrix);
 
+#if 1
+          cairo_paint (cr);
+#else
           cairo_mask (cr, pattern);
+#endif
+#if 0
+          /* enable this to test the cropping of the right */
+          cairo_set_source_rgba (cr, 0.5, 0.0, 0.0, 0.5);
+          cairo_mask (cr, pattern);
+#endif
           cairo_pattern_destroy (pattern);
 
           /* adjust the bitmap */
@@ -439,7 +448,16 @@
           cairo_pattern_set_matrix (pattern,
                                     &matrix);
 
+#if 1
+          cairo_paint (cr);
+#else
           cairo_mask (cr, pattern);
+#endif
+#if 0
+          /* enable this to test the cropping of the bottom */
+          cairo_set_source_rgba (cr, 0.0, 0.0, 0.5, 0.5);
+          cairo_mask (cr, pattern);
+#endif
           cairo_pattern_destroy (pattern);
 
           /* adjust the bitmap */
@@ -453,6 +471,12 @@
       cairo_restore (cr);
     }
 
+#if 0
+  /* enable this to test the mask only */
+  cairo_set_source_rgb (cr, 0.0, 0.5, 0.0);
+  cairo_paint (cr);
+#endif
+
   cairo_destroy (cr);
 }
 
@@ -513,7 +537,7 @@
       tmp_mask = gdk_pixmap_new (draw, tmp_width, tmp_height, 1);
 
       mask_cr = gdk_cairo_create (tmp_mask);
-      cairo_set_source_rgb (mask_cr, 1., 1., 1.);
+      cairo_set_operator (mask_cr, CAIRO_OPERATOR_CLEAR);
       cairo_paint (mask_cr);
     }