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 "C# control dashboard demo" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
color
/
color-visual.cpp
diff --git
a/dali-toolkit/internal/visuals/color/color-visual.cpp
b/dali-toolkit/internal/visuals/color/color-visual.cpp
index
781fdf7
..
08dfd20
100644
(file)
--- a/
dali-toolkit/internal/visuals/color/color-visual.cpp
+++ b/
dali-toolkit/internal/visuals/color/color-visual.cpp
@@
-80,9
+80,11
@@
const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER(
);
}
);
}
-ColorVisualPtr ColorVisual::New( VisualFactoryCache& factoryCache )
+ColorVisualPtr ColorVisual::New( VisualFactoryCache& factoryCache
, const Property::Map& properties
)
{
{
- return new ColorVisual( factoryCache );
+ ColorVisualPtr colorVisualPtr( new ColorVisual( factoryCache ) );
+ colorVisualPtr->SetProperties( properties );
+ return colorVisualPtr;
}
ColorVisual::ColorVisual( VisualFactoryCache& factoryCache )
}
ColorVisual::ColorVisual( VisualFactoryCache& factoryCache )