X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=plugins%2Fdali-script-v8%2Fsrc%2Fsignals%2Fsignal-manager.cpp;h=b4ce8fc6adc307f21a8dc277c3746dd8ac9c0e26;hp=e5cfb6729843b54533bea08fccce32fba97d3deb;hb=a7217209fc4331608f5875c1abb6ee1656045444;hpb=aabc3440c8952244a7f50af568e23c735a04ffef diff --git a/plugins/dali-script-v8/src/signals/signal-manager.cpp b/plugins/dali-script-v8/src/signals/signal-manager.cpp index e5cfb67..b4ce8fc 100644 --- a/plugins/dali-script-v8/src/signals/signal-manager.cpp +++ b/plugins/dali-script-v8/src/signals/signal-manager.cpp @@ -70,7 +70,7 @@ const char* const SIGNAL_IMAGE_UPLOADED = "uploaded"; const char* const KEYBOARD_FOCUS_MANAGER_SIGNAL_PRE_FOCUS_CHANGE = "keyboard-pre-focus-change"; const char* const KEYBOARD_FOCUS_MANAGER_SIGNAL_FOCUS_CHANGED = "keyboard-focus-changed"; const char* const KEYBOARD_FOCUS_MANAGER_SIGNAL_FOCUS_GROUP_CHANGED = "keyboard-focus-group-changed"; -const char* const KEYBOARD_FOCUS_MANAGER_SIGNAL_FOCUSED_ACTOR_ACTIVATED = "keyboard-focused-actor-activated"; +const char* const KEYBOARD_FOCUS_MANAGER_SIGNAL_FOCUSED_ACTOR_ENTER_KEY = "keyboard-focused-actor-enter-key"; const unsigned int MAX_SIGNAL_NAME_LENGTH = 64; } // un-named name space @@ -345,11 +345,11 @@ public: arguments.push_back( forward ); CallJavaScript( returnValue, arguments ); } - void FocusedActorSignal( Actor activatedActor ) + void EnterKeyPressedActorSignal( Actor enterKeyPressedActor ) { std::vector< Dali::Any > arguments; Dali::Any returnValue; //no return - arguments.push_back( activatedActor ); + arguments.push_back( enterKeyPressedActor ); CallJavaScript( returnValue, arguments ); } }; @@ -517,9 +517,9 @@ void KeyboardFocusManagerConnection( v8::Isolate* isolate, { keyboardFocusManager.FocusGroupChangedSignal().Connect( callback, &KeyboardFocusCallback::FocusGroupSignal ); } - else if ( strcmp( signalName.c_str(), KEYBOARD_FOCUS_MANAGER_SIGNAL_FOCUSED_ACTOR_ACTIVATED ) == 0 ) + else if ( strcmp( signalName.c_str(), KEYBOARD_FOCUS_MANAGER_SIGNAL_FOCUSED_ACTOR_ENTER_KEY ) == 0 ) { - keyboardFocusManager.FocusedActorActivatedSignal().Connect( callback, &KeyboardFocusCallback::FocusedActorSignal ); + keyboardFocusManager.FocusedActorEnterKeySignal().Connect( callback, &KeyboardFocusCallback::EnterKeyPressedActorSignal ); } else {