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
Update keyboard focus direction enum for Control
[platform/core/uifw/dali-toolkit.git]
/
plugins
/
dali-script-v8
/
src
/
toolkit
/
focus-manager
/
keyboard-focus-manager-api.cpp
diff --git
a/plugins/dali-script-v8/src/toolkit/focus-manager/keyboard-focus-manager-api.cpp
b/plugins/dali-script-v8/src/toolkit/focus-manager/keyboard-focus-manager-api.cpp
index
d39276c
..
b43e703
100644
(file)
--- a/
plugins/dali-script-v8/src/toolkit/focus-manager/keyboard-focus-manager-api.cpp
+++ b/
plugins/dali-script-v8/src/toolkit/focus-manager/keyboard-focus-manager-api.cpp
@@
-34,29
+34,29
@@
namespace // un named namespace
{
{
-Toolkit::Control::KeyboardFocus
Navigation
Direction GetDirection( std::string name, v8::Isolate* isolate )
+Toolkit::Control::KeyboardFocus
::
Direction GetDirection( std::string name, v8::Isolate* isolate )
{
if( name == "left")
{
{
if( name == "left")
{
- return Dali::Toolkit::Control::
Left
;
+ return Dali::Toolkit::Control::
KeyboardFocus::LEFT
;
}
if( name == "right")
{
}
if( name == "right")
{
- return Dali::Toolkit::Control::
Right
;
+ return Dali::Toolkit::Control::
KeyboardFocus::RIGHT
;
}
if( name == "up")
{
}
if( name == "up")
{
- return Dali::Toolkit::Control::
Up
;
+ return Dali::Toolkit::Control::
KeyboardFocus::UP
;
}
if( name == "down")
{
}
if( name == "down")
{
- return Dali::Toolkit::Control::
Down
;
+ return Dali::Toolkit::Control::
KeyboardFocus::DOWN
;
}
DALI_SCRIPT_EXCEPTION( isolate, "direction not found ( wanted left,right,up,down)" );
}
DALI_SCRIPT_EXCEPTION( isolate, "direction not found ( wanted left,right,up,down)" );
- return Dali::Toolkit::Control::
Up
;
+ return Dali::Toolkit::Control::
KeyboardFocus::UP
;
}
}; //un-named namespace
}
}; //un-named namespace
@@
-124,7
+124,7
@@
void KeyboardFocusManagerApi::MoveFocus( const v8::FunctionCallbackInfo< v8::Val
return;
}
return;
}
- Toolkit::Control::KeyboardFocus
Navigation
Direction dir = GetDirection( direction, isolate );
+ Toolkit::Control::KeyboardFocus
::
Direction dir = GetDirection( direction, isolate );
Toolkit::KeyboardFocusManager::Get().MoveFocus( dir );
}
Toolkit::KeyboardFocusManager::Get().MoveFocus( dir );
}