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 "DALi Version 1.4.10" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
node-addon
/
javascript-application-options.cpp
diff --git
a/node-addon/javascript-application-options.cpp
b/node-addon/javascript-application-options.cpp
index
7811583
..
eea3e9e
100644
(file)
--- a/
node-addon/javascript-application-options.cpp
+++ b/
node-addon/javascript-application-options.cpp
@@
-37,9
+37,8
@@
struct StereoInfo
};
StereoInfo StereoModeTable[] = {
{ "mono", Dali::MONO},
};
StereoInfo StereoModeTable[] = {
{ "mono", Dali::MONO},
- { "stereo-horizontal", Dali::STEREO_HORIZONTAL },
- { "stereo-vertical", Dali::STEREO_VERTICAL },
- { "stereo-interlaced", Dali::STEREO_INTERLACED },
+ { "stereoHorizontal", Dali::STEREO_HORIZONTAL },
+ { "stereoVertical", Dali::STEREO_VERTICAL },
};
const unsigned int numberViewModes = sizeof( StereoModeTable ) / sizeof( StereoModeTable[0] );
};
const unsigned int numberViewModes = sizeof( StereoModeTable ) / sizeof( StereoModeTable[0] );
@@
-114,8
+113,8
@@
bool ParseStereoScopicOptions( v8::Isolate* isolate, const v8::Local<v8::Object>
{
v8::HandleScope scope(isolate);
{
v8::HandleScope scope(isolate);
- v8::Local<v8::Value> modeValue = stereoObject->Get( v8::String::NewFromUtf8( isolate, "stereoscopic
-m
ode" ) );
- v8::Local<v8::Value> stereoBaseValue = stereoObject->Get( v8::String::NewFromUtf8( isolate, "stereo
-b
ase" ) );
+ v8::Local<v8::Value> modeValue = stereoObject->Get( v8::String::NewFromUtf8( isolate, "stereoscopic
M
ode" ) );
+ v8::Local<v8::Value> stereoBaseValue = stereoObject->Get( v8::String::NewFromUtf8( isolate, "stereo
B
ase" ) );
if( !modeValue->IsString() )
{
if( !modeValue->IsString() )
{
@@
-163,7
+162,7
@@
bool GetApplicationOptions(const v8::FunctionCallbackInfo<v8::Value>& args, Appl
}
// get the stereoscopic settings
}
// get the stereoscopic settings
- v8::Local<v8::Value> stereoValue= object->Get( v8::String::NewFromUtf8( isolate, "view
-m
ode" ) );
+ v8::Local<v8::Value> stereoValue= object->Get( v8::String::NewFromUtf8( isolate, "view
M
ode" ) );
if( stereoValue->IsObject() )
{
ok = ParseStereoScopicOptions( isolate, stereoValue->ToObject(), options.stereo );
if( stereoValue->IsObject() )
{
ok = ParseStereoScopicOptions( isolate, stereoValue->ToObject(), options.stereo );
@@
-174,7
+173,7
@@
bool GetApplicationOptions(const v8::FunctionCallbackInfo<v8::Value>& args, Appl
}
// get the style sheet
}
// get the style sheet
- v8::Local<v8::Value> stylesheetValue= object->Get( v8::String::NewFromUtf8( isolate, "style
-s
heet" ) );
+ v8::Local<v8::Value> stylesheetValue= object->Get( v8::String::NewFromUtf8( isolate, "style
S
heet" ) );
if( stylesheetValue->IsString() )
{
options.stylesheet = Dali::V8Plugin::V8Utils::v8StringToStdString( stylesheetValue );
if( stylesheetValue->IsString() )
{
options.stylesheet = Dali::V8Plugin::V8Utils::v8StringToStdString( stylesheetValue );