From a7217209fc4331608f5875c1abb6ee1656045444 Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Tue, 30 Jun 2015 12:11:39 +0100 Subject: [PATCH] JavaScript plugin build fix for keyboard focus manager Change-Id: I918b1f54fc787143f83379f5a6813da8faf80530 --- plugins/dali-script-v8/src/signals/signal-manager.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 { -- 2.7.4