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
Different image sets depending on style selected
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
builder
/
builder-impl.cpp
diff --git
a/dali-toolkit/internal/builder/builder-impl.cpp
b/dali-toolkit/internal/builder/builder-impl.cpp
index
0371491
..
11b92f6
100644
(file)
--- a/
dali-toolkit/internal/builder/builder-impl.cpp
+++ b/
dali-toolkit/internal/builder/builder-impl.cpp
@@
-124,11
+124,6
@@
std::string PropertyValueToString( const Property::Value& value )
ret = ToString( value.Get<int>() );
break;
}
ret = ToString( value.Get<int>() );
break;
}
- case Property::UNSIGNED_INTEGER:
- {
- ret = ToString( value.Get<unsigned int>() );
- break;
- }
case Property::VECTOR2:
{
ret = ToString( value.Get<Vector2>() );
case Property::VECTOR2:
{
ret = ToString( value.Get<Vector2>() );
@@
-722,9
+717,13
@@
FrameBufferImage Builder::GetFrameBufferImage( const std::string &name, const Re
if( SetPropertyFromNode( *image, Property::MAP, property, constant ) )
{
Property::Map* map = property.GetMap();
if( SetPropertyFromNode( *image, Property::MAP, property, constant ) )
{
Property::Map* map = property.GetMap();
- (*map)[ KEYNAME_TYPE ] = Property::Value(std::string("FrameBufferImage") );
- ret = FrameBufferImage::DownCast( Dali::Scripting::NewImage( property ) );
- mFrameBufferImageLut[ name ] = ret;
+
+ if( map )
+ {
+ (*map)[ KEYNAME_TYPE ] = Property::Value(std::string("FrameBufferImage") );
+ ret = FrameBufferImage::DownCast( Dali::Scripting::NewImage( property ) );
+ mFrameBufferImageLut[ name ] = ret;
+ }
}
}
}
}
}
}
@@
-1364,6
+1363,7
@@
Builder::Builder()
defaultDirs[ TOKEN_STRING(DALI_IMAGE_DIR) ] = DALI_IMAGE_DIR;
defaultDirs[ TOKEN_STRING(DALI_SOUND_DIR) ] = DALI_SOUND_DIR;
defaultDirs[ TOKEN_STRING(DALI_STYLE_DIR) ] = DALI_STYLE_DIR;
defaultDirs[ TOKEN_STRING(DALI_IMAGE_DIR) ] = DALI_IMAGE_DIR;
defaultDirs[ TOKEN_STRING(DALI_SOUND_DIR) ] = DALI_SOUND_DIR;
defaultDirs[ TOKEN_STRING(DALI_STYLE_DIR) ] = DALI_STYLE_DIR;
+ defaultDirs[ TOKEN_STRING(DALI_STYLE_IMAGE_DIR) ] = DALI_STYLE_IMAGE_DIR;
AddConstants( defaultDirs );
}
AddConstants( defaultDirs );
}