X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer_solidcolor.cpp;h=9cd1ba63702b84beb9726e8a71d19de7adf2d5fb;hb=d62300935546505305385dba525025a548c7b26b;hp=6590828fbe0b70f42ad5d53e76076b40ae95547e;hpb=e8a065f2385c219c511b57dac52786120bfa097d;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/layer_solidcolor.cpp b/synfig-core/trunk/src/synfig/layer_solidcolor.cpp index 6590828..9cd1ba6 100644 --- a/synfig-core/trunk/src/synfig/layer_solidcolor.cpp +++ b/synfig-core/trunk/src/synfig/layer_solidcolor.cpp @@ -67,12 +67,12 @@ Layer_SolidColor::Layer_SolidColor(): color(Color::black()) { } - + bool Layer_SolidColor::set_param(const String & param, const ValueBase &value) { IMPORT(color); - + return Layer_Composite::set_param(param,value); } @@ -83,19 +83,19 @@ Layer_SolidColor::get_param(const String ¶m)const EXPORT_NAME(); EXPORT_VERSION(); - - return Layer_Composite::get_param(param); + + return Layer_Composite::get_param(param); } Layer::Vocab Layer_SolidColor::get_param_vocab()const { Layer::Vocab ret(Layer_Composite::get_param_vocab()); - + ret.push_back(ParamDesc("color") .set_local_name(_("Color")) ); - + return ret; } @@ -107,9 +107,9 @@ Layer_SolidColor::hit_check(synfig::Context context, const synfig::Point &point) else if(get_blend_method()==Color::BLEND_COMPOSITE && get_amount()*color.get_a()>=0.5) return const_cast(this); - + Layer::Handle layer(context.hit_check(point)); - + return layer?layer:const_cast(this); } @@ -121,7 +121,7 @@ Layer_SolidColor::get_color(Context context, const Point &pos)const else return Color::blend(color,context.get_color(pos),get_amount(),get_blend_method()); } - + bool Layer_SolidColor::accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const { @@ -130,7 +130,7 @@ Layer_SolidColor::accelerated_render(Context context,Surface *surface,int qualit // Mark our progress as starting if(cb && !cb->amount_complete(0,1000)) return false; - + surface->set_wh(renddesc.get_w(),renddesc.get_h()); surface->fill(color);