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 "Text - TextClipper replaced by an Actor with the CLIPPING_MODE enabled." into...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
border
/
border-visual.cpp
diff --git
a/dali-toolkit/internal/visuals/border/border-visual.cpp
b/dali-toolkit/internal/visuals/border/border-visual.cpp
index
ac5cf01
..
3811a64
100644
(file)
--- a/
dali-toolkit/internal/visuals/border/border-visual.cpp
+++ b/
dali-toolkit/internal/visuals/border/border-visual.cpp
@@
-119,9
+119,11
@@
const char* FRAGMENT_SHADER_ANTI_ALIASING = DALI_COMPOSE_SHADER(
);
}
);
}
-BorderVisualPtr BorderVisual::New( VisualFactoryCache& factoryCache )
+BorderVisualPtr BorderVisual::New( VisualFactoryCache& factoryCache
, const Property::Map& properties
)
{
{
- return new BorderVisual( factoryCache );
+ BorderVisualPtr borderVisualPtr( new BorderVisual( factoryCache ) );
+ borderVisualPtr->SetProperties( properties );
+ return borderVisualPtr;
}
BorderVisual::BorderVisual( VisualFactoryCache& factoryCache )
}
BorderVisual::BorderVisual( VisualFactoryCache& factoryCache )