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 toolkit-window to add/remove actors in the correct Scene
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
focus-manager
/
keyboard-focus-manager-impl.cpp
diff --git
a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
index
7117686
..
bba7702
100644
(file)
--- a/
dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
+++ b/
dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
@@
-328,7
+328,12
@@
Toolkit::Control KeyboardFocusManager::GetParentLayoutControl(Actor actor) const
Actor parent;
if(actor)
{
Actor parent;
if(actor)
{
- rootActor = Integration::SceneHolder::Get( actor ).GetRootLayer();
+ Integration::SceneHolder window = Integration::SceneHolder::Get( actor );
+ if ( window )
+ {
+ rootActor = window.GetRootLayer();
+ }
+
parent = actor.GetParent();
}
parent = actor.GetParent();
}
@@
-410,7
+415,11
@@
bool KeyboardFocusManager::MoveFocus(Toolkit::Control::KeyboardFocus::Direction
if( !nextFocusableActor )
{
if( !nextFocusableActor )
{
- nextFocusableActor = Integration::SceneHolder::Get( currentFocusActor ).GetRootLayer().FindChildById( actorId );
+ Integration::SceneHolder window = Integration::SceneHolder::Get( currentFocusActor );
+ if ( window )
+ {
+ nextFocusableActor = window.GetRootLayer().FindChildById( actorId );
+ }
}
}
}
}
}
}