**
** \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
bool
Rectangle::set_param(const String & param, const ValueBase &value)
{
- IMPORT_PLUS(color, { if (color.get_a() == 0) if (converted_blend_) {
+ 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; });
+ color.set_a(1); } else transparent_color_ = true; } });
IMPORT(point1);
IMPORT(point2);
IMPORT(expand);
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