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
New propagation rule for KeyEvent
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
control-impl.cpp
diff --git
a/dali-toolkit/public-api/controls/control-impl.cpp
b/dali-toolkit/public-api/controls/control-impl.cpp
index
c4ee219
..
fffbe69
100644
(file)
--- a/
dali-toolkit/public-api/controls/control-impl.cpp
+++ b/
dali-toolkit/public-api/controls/control-impl.cpp
@@
-1142,7
+1142,11
@@
bool Control::HasKeyInputFocus()
bool result = false;
if( Self().OnStage() )
{
bool result = false;
if( Self().OnStage() )
{
- result = Toolkit::KeyInputFocusManager::Get().IsKeyboardListener(Toolkit::Control::DownCast(Self()));
+ Toolkit::Control control = Toolkit::KeyInputFocusManager::Get().GetCurrentFocusControl();
+ if( Self() == control )
+ {
+ result = true;
+ }
}
return result;
}
}
return result;
}