Author: spouliot
Date: 2008-01-14 12:54:59 -0500 (Mon, 14 Jan 2008)
New Revision: 92886
Modified:
trunk/moon/src/ChangeLog
trunk/moon/src/shape.cpp
trunk/moon/src/shape.h
Log:
2008-01-14 Sebastien Pouliot <[EMAIL PROTECTED]>
* shape.cpp|h: It looks like we stopped needing consider_fill a
while ago.
Modified: trunk/moon/src/ChangeLog
===================================================================
--- trunk/moon/src/ChangeLog 2008-01-14 17:54:39 UTC (rev 92885)
+++ trunk/moon/src/ChangeLog 2008-01-14 17:54:59 UTC (rev 92886)
@@ -1,3 +1,8 @@
+2008-01-14 Sebastien Pouliot <[EMAIL PROTECTED]>
+
+ * shape.cpp|h: It looks like we stopped needing consider_fill a
+ while ago.
+
2008-01-14 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
* mplayer.h: We don't need io_tread anymore, so remove it.
Modified: trunk/moon/src/shape.cpp
===================================================================
--- trunk/moon/src/shape.cpp 2008-01-14 17:54:39 UTC (rev 92885)
+++ trunk/moon/src/shape.cpp 2008-01-14 17:54:59 UTC (rev 92886)
@@ -172,7 +172,7 @@
// to either get the bounding box from cairo, or to paint it
//
void
-Shape::DoDraw (cairo_t *cr, bool do_op, bool consider_fill)
+Shape::DoDraw (cairo_t *cr, bool do_op)
{
if (IsEmpty ()) {
cairo_new_path (cr);
@@ -209,7 +209,7 @@
// getting bounds, using cairo_stroke_extents, doesn't requires us to
fill (consider_fill)
// unless there is no stroke brush assigned, which requires us to fill
and use cairo_fill_extents
// also not every shapes can be filled
- if (!IsDegenerate () && (consider_fill || !stroke) && IsFilled ()) {
+ if (!IsDegenerate () && IsFilled ()) {
if (fill) {
Draw (cr);
drawn = true;
@@ -298,7 +298,7 @@
Shape::Render (cairo_t *cr, int x, int y, int width, int height)
{
cairo_save (cr);
- DoDraw (cr, true, true);
+ DoDraw (cr, true);
cairo_restore (cr);
}
@@ -381,7 +381,7 @@
cairo_save (cr);
// don't do the operation but do consider filling
- DoDraw (cr, false, true);
+ DoDraw (cr, false);
double nx = x;
double ny = y;
Modified: trunk/moon/src/shape.h
===================================================================
--- trunk/moon/src/shape.h 2008-01-14 17:54:39 UTC (rev 92885)
+++ trunk/moon/src/shape.h 2008-01-14 17:54:59 UTC (rev 92886)
@@ -34,7 +34,7 @@
class Shape : public FrameworkElement {
protected:
Brush *stroke, *fill;
- void DoDraw (cairo_t *cr, bool do_op, bool consider_fill);
+ void DoDraw (cairo_t *cr, bool do_op);
moon_path *path;
virtual void InvalidatePathCache (bool free = false);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
