Author: lewing
Date: 2007-12-03 19:26:42 -0500 (Mon, 03 Dec 2007)
New Revision: 90611
Modified:
trunk/moon/ChangeLog
trunk/moon/src/media.cpp
Log:
2007-12-03 Larry Ewing <[EMAIL PROTECTED]>
* src/media.cpp (Image::Render): don't buffer alpha images use
paint_with_alpha instead.
Modified: trunk/moon/ChangeLog
===================================================================
--- trunk/moon/ChangeLog 2007-12-04 00:19:07 UTC (rev 90610)
+++ trunk/moon/ChangeLog 2007-12-04 00:26:42 UTC (rev 90611)
@@ -1,5 +1,10 @@
2007-12-03 Larry Ewing <[EMAIL PROTECTED]>
+ * src/media.cpp (Image::Render): don't buffer alpha images use
+ paint_with_alpha instead.
+
+2007-12-03 Larry Ewing <[EMAIL PROTECTED]>
+
* src/media.cpp (Image::Render): remove accumulated drawing cruft.
2007-11-29 Larry Ewing <[EMAIL PROTECTED]>
Modified: trunk/moon/src/media.cpp
===================================================================
--- trunk/moon/src/media.cpp 2007-12-04 00:19:07 UTC (rev 90610)
+++ trunk/moon/src/media.cpp 2007-12-04 00:26:42 UTC (rev 90611)
@@ -1439,7 +1439,14 @@
double w = framework_element_get_width (this);
double h = framework_element_get_height (this);
- double opacity = GetTotalOpacity ();
+ double render_opacity = GetTotalOpacity ();
+ double opacity = 1.0;
+
+#if USE_OPT_BUFFERED_IMAGE
+ opacity = render_opacity;
+ render_opacity = 1.0
+#else
+
if (!pattern || (floor (pattern_opacity * 255) != floor (opacity *
255))) {
// don't share surfaces until they are of the correct type
if (pattern && !surface->xlib_surface_created) {
@@ -1494,14 +1501,14 @@
#endif
cairo_set_matrix (cr, &absolute_xform);
-#if DRAW_INCORRECTLY
- cairo_rectangle (cr, 0, 0, w, h);
- cairo_clip (cr);
- cairo_paint (cr);
-#else
- cairo_rectangle (cr, 0, 0, w, h);
- cairo_fill (cr);
-#endif
+ if (render_opacity < 1.0) {
+ cairo_rectangle (cr, 0, 0, w, h);
+ cairo_clip (cr);
+ cairo_paint_with_alpha (cr, render_opacity);
+ } else {
+ cairo_rectangle (cr, 0, 0, w, h);
+ cairo_fill (cr);
+ }
cairo_restore (cr);
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches