Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-core / trunk / src / modules / mod_geometry / rectangle.cpp

diff --git a/synfig-core/trunk/src/modules/mod_geometry/rectangle.cpp b/synfig-core/trunk/src/modules/mod_geometry/rectangle.cpp
index 537f1ec..374af9c 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_geometry/rectangle.cpp
+++ b/synfig-core/trunk/src/modules/mod_geometry/rectangle.cpp
@@ -1,12 +1,12 @@
 /* === S Y N F I G ========================================================= */
 /*!    \file rectangle.cpp
-**     \brief Template Header
+**     \brief Implementation of the "Rectangle" layer
 **
 **     $Id$
 **
 **     \legal
 **     Copyright (c) 2002 Robert B. Quattlebaum Jr.
-**     Copyright (c) 2007 Chris Moore
+**     Copyright (c) 2007, 2008 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -55,8 +55,8 @@ using namespace synfig;
 
 SYNFIG_LAYER_INIT(Rectangle);
 SYNFIG_LAYER_SET_NAME(Rectangle,"rectangle");
-SYNFIG_LAYER_SET_LOCAL_NAME(Rectangle,_("Rectangle"));
-SYNFIG_LAYER_SET_CATEGORY(Rectangle,_("Geometry"));
+SYNFIG_LAYER_SET_LOCAL_NAME(Rectangle,N_("Rectangle"));
+SYNFIG_LAYER_SET_CATEGORY(Rectangle,N_("Geometry"));
 SYNFIG_LAYER_SET_VERSION(Rectangle,"0.2");
 SYNFIG_LAYER_SET_CVS_ID(Rectangle,"$Id$");
 
@@ -87,7 +87,9 @@ Rectangle::Rectangle():
 bool
 Rectangle::set_param(const String & param, const ValueBase &value)
 {
-       IMPORT(color);
+       IMPORT_PLUS(color, { if (color.get_a() == 0) { if (converted_blend_) {
+                                       set_blend_method(Color::BLEND_ALPHA_OVER);
+                                       color.set_a(1); } else transparent_color_ = true; } });
        IMPORT(point1);
        IMPORT(point2);
        IMPORT(expand);
@@ -272,27 +274,26 @@ Rectangle::get_color(Context context, const Point &pos)const
        if(     pos[0]<max[0] && pos[0]>min[0] &&
                pos[1]<max[1] && pos[1]>min[1] )
        {
+               // inside the expanded rectangle
                if(invert)
-                       return context.get_color(pos);
-               else
-               {
-                       if(is_solid_color())
-                               return color;
-                       else
-                               return Color::blend(color,context.get_color(pos),get_amount(),get_blend_method());
+                       return Color::blend(Color::alpha(),context.get_color(pos),get_amount(),get_blend_method());
 
-               }
-       }
+               if(is_solid_color())
+                       return color;
 
-       if(invert)
+               return Color::blend(color,context.get_color(pos),get_amount(),get_blend_method());
+       }
+       else
        {
+               // outside the expanded rectangle
+               if(!invert)
+                       return Color::blend(Color::alpha(),context.get_color(pos),get_amount(),get_blend_method());
+
                if(is_solid_color())
                        return color;
-               else
-                       return Color::blend(color,context.get_color(pos),get_amount(),get_blend_method());
-       }
 
-       return context.get_color(pos);
+               return Color::blend(color,context.get_color(pos),get_amount(),get_blend_method());
+       }
 }
 
 bool
@@ -422,7 +423,7 @@ Rectangle::accelerated_render(Context context,Surface *surface,int quality, cons
                                surface->blit_to(subimage_pen,left,top,right-left,bottom-top);
                        }
 
-                       // fill surface with the rectangle's colour
+                       // fill surface with the rectangle's color
                        Surface::alpha_pen surface_pen(surface->begin(),get_amount(),get_blend_method());
                        surface->fill(color,surface_pen,w,h);
 
@@ -490,8 +491,8 @@ Rectangle::accelerated_render(Context context,Surface *surface,int quality, cons
        right = std::min(w,right);
 */
 
-       // optimisation - if the whole tile is covered by this rectangle,
-       // and the rectangle is a solid colour, we don't need to render
+       // optimization - if the whole tile is covered by this rectangle,
+       // and the rectangle is a solid color, we don't need to render
        // what's behind us
        if (is_solid_color() && top == 0 && left == 0 && bottom == h && right == w)
        {