X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fborder%2Fborder-visual.cpp;h=229d12cf11bff345bd2f0838e2b540daba66a6e6;hb=refs%2Fchanges%2F16%2F240216%2F2;hp=a64b48d70c404c064429750192b212c5ddf01558;hpb=4cc02f3e2045755c2c65e64a6f5e126a4c6208ea;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/visuals/border/border-visual.cpp b/dali-toolkit/internal/visuals/border/border-visual.cpp index a64b48d..229d12c 100644 --- a/dali-toolkit/internal/visuals/border/border-visual.cpp +++ b/dali-toolkit/internal/visuals/border/border-visual.cpp @@ -125,7 +125,7 @@ BorderVisualPtr BorderVisual::New( VisualFactoryCache& factoryCache, const Prope } BorderVisual::BorderVisual( VisualFactoryCache& factoryCache ) -: Visual::Base( factoryCache, Visual::FittingMode::FILL ), +: Visual::Base( factoryCache, Visual::FittingMode::FILL, Toolkit::Visual::BORDER ), mBorderColor( Color::TRANSPARENT ), mBorderSize( 0.f ), mBorderColorIndex( Property::INVALID_INDEX ), @@ -197,7 +197,7 @@ void BorderVisual::DoSetProperty( Dali::Property::Index index, } } -void BorderVisual::DoSetOnStage( Actor& actor ) +void BorderVisual::DoSetOnScene( Actor& actor ) { InitializeRenderer(); @@ -252,47 +252,6 @@ void BorderVisual::InitializeRenderer() mImpl->mTransform.RegisterUniforms( mImpl->mRenderer, Direction::LEFT_TO_RIGHT ); } -void BorderVisual::SetBorderColor(const Vector4& color) -{ - mBorderColor = color; - - if( mImpl->mRenderer ) - { - (mImpl->mRenderer).SetProperty( mBorderColorIndex, color ); - if( color.a < 1.f ) - { - mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON ); - } - } -} - -void BorderVisual::SetBorderSize( float size ) -{ - mBorderSize = size; - - if( mImpl->mRenderer ) - { - (mImpl->mRenderer).SetProperty( mBorderSizeIndex, size ); - } -} - -void BorderVisual::RequireAntiAliasing( bool antiAliasing ) -{ - if( mAntiAliasing != antiAliasing ) - { - mAntiAliasing = antiAliasing; - if( mImpl->mRenderer ) - { - Shader borderShader( GetBorderShader() ); - mImpl->mRenderer.SetShader( borderShader ); - if( mAntiAliasing ) - { - mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON ); - } - } - } -} - Shader BorderVisual::GetBorderShader() { Shader shader;