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 "Add new layouting support for TextLabel and ImageView." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
visual-string-constants.cpp
diff --git
a/dali-toolkit/internal/visuals/visual-string-constants.cpp
b/dali-toolkit/internal/visuals/visual-string-constants.cpp
index
864dde0
..
ad5b4ae
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-string-constants.cpp
+++ b/
dali-toolkit/internal/visuals/visual-string-constants.cpp
@@
-73,7
+73,7
@@
const char * const MIX_COLOR( "mixColor" );
const char * const OPACITY( "opacity" );
// Fitting mode
const char * const OPACITY( "opacity" );
// Fitting mode
-const char * const
FITTING_MODE( "f
ittingMode" );
+const char * const
VISUAL_FITTING_MODE( "visualF
ittingMode" );
// Color visual
const char * const RENDER_IF_TRANSPARENT_NAME( "renderIfTransparent" );
// Color visual
const char * const RENDER_IF_TRANSPARENT_NAME( "renderIfTransparent" );