projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Implemented custom shader in ImageRenderer and changed Dissolve-effect to...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
renderers
/
border
/
border-renderer.cpp
diff --git
a/dali-toolkit/internal/controls/renderers/border/border-renderer.cpp
b/dali-toolkit/internal/controls/renderers/border/border-renderer.cpp
index
423afc2
..
6542a2c
100644
(file)
--- a/
dali-toolkit/internal/controls/renderers/border/border-renderer.cpp
+++ b/
dali-toolkit/internal/controls/renderers/border/border-renderer.cpp
@@
-88,7
+88,7
@@
BorderRenderer::~BorderRenderer()
{
}
{
}
-void BorderRenderer::Initialize( RendererFactoryCache& factoryCache, const Property::Map& propertyMap )
+void BorderRenderer::
Do
Initialize( RendererFactoryCache& factoryCache, const Property::Map& propertyMap )
{
Initialize( factoryCache );
{
Initialize( factoryCache );
@@
-122,7
+122,7
@@
void BorderRenderer::DoSetOnStage( Actor& actor )
mBorderSizeIndex = (mImpl->mRenderer).RegisterProperty( SIZE_UNIFORM_NAME, mBorderSize );
}
mBorderSizeIndex = (mImpl->mRenderer).RegisterProperty( SIZE_UNIFORM_NAME, mBorderSize );
}
-void BorderRenderer::CreatePropertyMap( Property::Map& map ) const
+void BorderRenderer::
Do
CreatePropertyMap( Property::Map& map ) const
{
map.Clear();
map.Insert( RENDERER_TYPE, RENDERER_TYPE_VALUE );
{
map.Clear();
map.Insert( RENDERER_TYPE, RENDERER_TYPE_VALUE );