Author: lewing
Date: 2007-10-11 18:01:23 -0400 (Thu, 11 Oct 2007)
New Revision: 87363

Modified:
   trunk/moon/src/panel.cpp
Log:
Squashed commit of the following:

commit b762ed9767366ecd92f746ae2b588266babf532c
Author: Larry Ewing <[EMAIL PROTECTED]>
Date:   Thu Oct 11 17:07:44 2007 -0500

    I don't include the panel background if it doesn't exist.

commit 629e592e0804d3f38d82890efe3a2477f7af3947
Author: Larry Ewing <[EMAIL PROTECTED]>
Date:   Mon Oct 8 01:54:45 2007 -0500

    Clip the intersection using integer coordinates.


Modified: trunk/moon/src/panel.cpp
===================================================================
--- trunk/moon/src/panel.cpp    2007-10-11 21:45:41 UTC (rev 87362)
+++ trunk/moon/src/panel.cpp    2007-10-11 22:01:23 UTC (rev 87363)
@@ -124,7 +124,8 @@
        x2 = framework_element_get_width (this);
        y2 = framework_element_get_height (this);
 
-       if (x2 != 0.0 && y2 != 0.0) {
+       Value *value = GetValue (Panel::BackgroundProperty);
+       if (value && x2 != 0.0 && y2 != 0.0) {
                Rect fw_rect = bounding_rect_for_transformed_rect 
(&absolute_xform,
                                                                   
IntersectBoundsWithClipPath (Rect (x1,y1,x2,y2), false));
 
@@ -289,7 +290,8 @@
                        //printf ("Clipping to %g %g %g %g\n", inter.x, 
inter.y, inter.w, inter.h);
                        // at the very least we need to clip based on the 
expose area.
                        // there's also a UIElement::ClipProperty
-                       cairo_rectangle (cr, inter.x, inter.y, inter.w, 
inter.h);
+                       cairo_rectangle (cr, floor (inter.x), floor (inter.y), 
ceiling (inter.w), ceiling (inter.h));
+
                        cairo_clip (cr);
 #if TIME_CLIP
                        ENDTIMER(clip, "cairo clip setup");

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to