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 "Delete view from toolkit and move cluster into demo" into tizen
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
focus-manager
/
keyinput-focus-manager-impl.cpp
diff --git
a/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
b/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
index
dc8cefa
..
9fee428
100644
(file)
--- a/
dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
+++ b/
dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
@@
-19,6
+19,7
@@
#include "keyinput-focus-manager-impl.h"
// EXTERNAL INCLUDES
#include "keyinput-focus-manager-impl.h"
// EXTERNAL INCLUDES
+#include <cstring> // for strcmp
#include <dali/public-api/actors/layer.h>
#include <dali/public-api/common/stage.h>
#include <dali/public-api/actors/layer.h>
#include <dali/public-api/common/stage.h>
@@
-35,6
+36,16
@@
namespace Toolkit
namespace Internal
{
namespace Internal
{
+namespace
+{
+
+// Signals
+
+const char* const SIGNAL_KEY_INPUT_FOCUS_CHANGED = "key-input-focus-changed";
+const char* const SIGNAL_UNHANDLED_KEY_EVENT = "unhandled-key-event";
+
+}
+
KeyInputFocusManager::KeyInputFocusManager()
: mSlotDelegate( this )
{
KeyInputFocusManager::KeyInputFocusManager()
: mSlotDelegate( this )
{
@@
-220,12
+231,16
@@
bool KeyInputFocusManager::DoConnectSignal( BaseObject* object, ConnectionTracke
Dali::BaseHandle handle( object );
bool connected( true );
Dali::BaseHandle handle( object );
bool connected( true );
- KeyInputFocusManager* manager = dynamic_cast<KeyInputFocusManager*>(
object
);
+ KeyInputFocusManager* manager = dynamic_cast<KeyInputFocusManager*>(
object
);
- if(
Dali::Toolkit::KeyInputFocusManager::SIGNAL_KEY_INPUT_FOCUS_CHANGED == signalName
)
+ if(
0 == strcmp( signalName.c_str(), SIGNAL_KEY_INPUT_FOCUS_CHANGED )
)
{
manager->KeyInputFocusChangedSignal().Connect( tracker, functor );
}
{
manager->KeyInputFocusChangedSignal().Connect( tracker, functor );
}
+ else if( 0 == strcmp( signalName.c_str(), SIGNAL_UNHANDLED_KEY_EVENT ) )
+ {
+ manager->UnhandledKeyEventSignal().Connect( tracker, functor );
+ }
else
{
// signalName does not match any signal
else
{
// signalName does not match any signal