X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fexample%2Ffilledrect.cpp;h=0c165edaf2daefd67d57d7261a7878d136984aaa;hb=4dc57ca027fbe1dce954961812788703f0feeb8a;hp=72125ee2122a0ee28f9f34a67b30a064f9d7e5ea;hpb=cc54c38609ee9745ad678e5e9b9d7d2912be9c95;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/example/filledrect.cpp b/synfig-core/trunk/src/modules/example/filledrect.cpp
index 72125ee..0c165ed 100644
--- a/synfig-core/trunk/src/modules/example/filledrect.cpp
+++ b/synfig-core/trunk/src/modules/example/filledrect.cpp
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file filledrect.cpp
-**	\brief Template Header
+**	\brief Implementation of the "Rectangle" layer
 **
 **	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 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
@@ -52,9 +53,9 @@ using namespace synfig;
 /* === G L O B A L S ======================================================= */
 
 SYNFIG_LAYER_INIT(FilledRect);
-SYNFIG_LAYER_SET_NAME(FilledRect,"rectangle");
-SYNFIG_LAYER_SET_LOCAL_NAME(FilledRect,_("Rectangle"));
-SYNFIG_LAYER_SET_CATEGORY(FilledRect,_("Geometry"));
+SYNFIG_LAYER_SET_NAME(FilledRect,"filled_rectangle");
+SYNFIG_LAYER_SET_LOCAL_NAME(FilledRect,N_("Filled Rectangle"));
+SYNFIG_LAYER_SET_CATEGORY(FilledRect,N_("Example"));
 SYNFIG_LAYER_SET_VERSION(FilledRect,"0.1");
 SYNFIG_LAYER_SET_CVS_ID(FilledRect,"$Id$");
 
@@ -82,8 +83,8 @@ FilledRect::set_param(const String & param, const ValueBase &value)
 	IMPORT(color);
 	IMPORT(point1);
 	IMPORT(point2);
-	IMPORT(feather_x);
-	IMPORT(feather_y);
+	IMPORT_PLUS(feather_x, if(feather_x<0)feather_x=0;);
+	IMPORT_PLUS(feather_y, if(feather_y<0)feather_y=0;);
 	IMPORT(bevel);
 	IMPORT(bevCircle);
 
@@ -331,12 +332,12 @@ FilledRect::accelerated_render(Context context,Surface *surface,int quality, con
 	//the bounds of the rectangle
 	Point p[2] = {point1,point2};
 
-	if((p[0][0] > p[1][0]) ^ wpp < 0)
+	if((p[0][0] > p[1][0]) ^ (wpp < 0))
 	{
 		swap(p[0][0],p[1][0]);
 	}
 
-	if((p[0][1] > p[1][1]) ^ hpp < 0)
+	if((p[0][1] > p[1][1]) ^ (hpp < 0))
 	{
 		swap(p[0][1],p[1][1]);
 	}