projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use LinkableValueNode members functions when possible in the derived valuenodes.
[synfig.git]
/
synfig-core
/
src
/
modules
/
mod_geometry
/
rectangle.cpp
diff --git
a/synfig-core/src/modules/mod_geometry/rectangle.cpp
b/synfig-core/src/modules/mod_geometry/rectangle.cpp
index
374af9c
..
0d4b94a
100644
(file)
--- a/
synfig-core/src/modules/mod_geometry/rectangle.cpp
+++ b/
synfig-core/src/modules/mod_geometry/rectangle.cpp
@@
-75,13
+75,15
@@
inline int floor_to_int(const double x) { return static_cast<int>(floor(x)); }
/* === E N T R Y P O I N T ================================================= */
Rectangle::Rectangle():
/* === E N T R Y P O I N T ================================================= */
Rectangle::Rectangle():
- Layer_Composite(1.0,Color::BLEND_
STRAIGHT
),
+ Layer_Composite(1.0,Color::BLEND_
COMPOSITE
),
color(Color::black()),
point1(0,0),
point2(1,1),
expand(0),
invert(false)
{
color(Color::black()),
point1(0,0),
point2(1,1),
expand(0),
invert(false)
{
+ Layer::Vocab voc(get_param_vocab());
+ Layer::fill_static(voc);
}
bool
}
bool
@@
-120,15
+122,18
@@
Rectangle::get_param_vocab()const
ret.push_back(ParamDesc("color")
.set_local_name(_("Color"))
ret.push_back(ParamDesc("color")
.set_local_name(_("Color"))
+ .set_description(_("Fill color of the layer"))
);
ret.push_back(ParamDesc("point1")
.set_local_name(_("Point 1"))
.set_box("point2")
);
ret.push_back(ParamDesc("point1")
.set_local_name(_("Point 1"))
.set_box("point2")
+ .set_description(_("First corner of the rectangle"))
);
ret.push_back(ParamDesc("point2")
.set_local_name(_("Point 2"))
);
ret.push_back(ParamDesc("point2")
.set_local_name(_("Point 2"))
+ .set_description(_("Second corner of the rectangle"))
);
ret.push_back(ParamDesc("expand")
);
ret.push_back(ParamDesc("expand")