projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure that global variables are initialized lazily.
[platform/core/uifw/dali-adaptor.git]
/
dali
/
devel-api
/
adaptor-framework
/
accessibility.cpp
diff --git
a/dali/devel-api/adaptor-framework/accessibility.cpp
b/dali/devel-api/adaptor-framework/accessibility.cpp
index
b058328
..
1139607
100644
(file)
--- a/
dali/devel-api/adaptor-framework/accessibility.cpp
+++ b/
dali/devel-api/adaptor-framework/accessibility.cpp
@@
-366,7
+366,7
@@
public:
return false;
}
return false;
}
- auto self = Self();
+ auto self
= Self();
auto oldHighlightedActor = GetCurrentlyHighlightedActor();
if(self == oldHighlightedActor)
{
auto oldHighlightedActor = GetCurrentlyHighlightedActor();
if(self == oldHighlightedActor)
{
@@
-385,7
+385,7
@@
public:
SetCurrentlyHighlightedActor(self);
SetCurrentlyHighlightedActor(self);
- auto
window
= Dali::DevelWindow::Get(self);
+ auto
window
= Dali::DevelWindow::Get(self);
Dali::Internal::Adaptor::Window& windowImpl = Dali::GetImplementation(window);
windowImpl.EmitAccessibilityHighlightSignal(true);
Dali::Internal::Adaptor::Window& windowImpl = Dali::GetImplementation(window);
windowImpl.EmitAccessibilityHighlightSignal(true);
@@
-413,7
+413,7
@@
public:
SetCurrentlyHighlightedActor({});
SetCurrentlyHighlightedActor({});
- auto
window
= Dali::DevelWindow::Get(self);
+ auto
window
= Dali::DevelWindow::Get(self);
Dali::Internal::Adaptor::Window& windowImpl = Dali::GetImplementation(window);
windowImpl.EmitAccessibilityHighlightSignal(false);
Dali::Internal::Adaptor::Window& windowImpl = Dali::GetImplementation(window);
windowImpl.EmitAccessibilityHighlightSignal(false);
@@
-453,7
+453,7
@@
public:
if(mRoot)
{
if(mRoot)
{
- Dali::Window
window
= Dali::DevelWindow::Get(Self());
+ Dali::Window
window
= Dali::DevelWindow::Get(Self());
Dali::Internal::Adaptor::Window& windowImpl = Dali::GetImplementation(window);
attributes["resID"] = windowImpl.GetNativeResourceId();
}
Dali::Internal::Adaptor::Window& windowImpl = Dali::GetImplementation(window);
attributes["resID"] = windowImpl.GetNativeResourceId();
}
@@
-479,7
+479,11
@@
public:
using AdaptorAccessiblesType = std::unordered_map<const Dali::RefObject*, std::unique_ptr<AdaptorAccessible> >;
// Save RefObject from an Actor in Accessible::Get()
using AdaptorAccessiblesType = std::unordered_map<const Dali::RefObject*, std::unique_ptr<AdaptorAccessible> >;
// Save RefObject from an Actor in Accessible::Get()
-AdaptorAccessiblesType gAdaptorAccessibles;
+AdaptorAccessiblesType& GetAdaptorAccessibles()
+{
+ static AdaptorAccessiblesType gAdaptorAccessibles;
+ return gAdaptorAccessibles;
+}
std::function<Accessible*(Dali::Actor)> convertingFunctor = [](Dali::Actor) -> Accessible* {
return nullptr;
std::function<Accessible*(Dali::Actor)> convertingFunctor = [](Dali::Actor) -> Accessible* {
return nullptr;
@@
-492,7
+496,7
@@
void Accessible::SetObjectRegistry(ObjectRegistry registry)
{
objectRegistry = registry;
objectRegistry.ObjectDestroyedSignal().Connect([](const Dali::RefObject* obj) {
{
objectRegistry = registry;
objectRegistry.ObjectDestroyedSignal().Connect([](const Dali::RefObject* obj) {
-
gAdaptorAccessibles
.erase(obj);
+
GetAdaptorAccessibles()
.erase(obj);
});
}
});
}
@@
-511,11
+515,11
@@
Accessible* Accessible::Get(Dali::Actor actor)
auto accessible = convertingFunctor(actor);
if(!accessible)
{
auto accessible = convertingFunctor(actor);
if(!accessible)
{
- auto pair =
gAdaptorAccessibles
.emplace(&actor.GetBaseObject(), nullptr);
+ auto pair =
GetAdaptorAccessibles()
.emplace(&actor.GetBaseObject(), nullptr);
if(pair.second)
{
if(pair.second)
{
- bool
isRoot
= false;
- Dali::Integration::Scene scene = Dali::Integration::Scene::Get(actor);
+ bool
isRoot
= false;
+ Dali::Integration::Scene scene
= Dali::Integration::Scene::Get(actor);
if(scene)
{
isRoot = (actor == scene.GetRootLayer());
if(scene)
{
isRoot = (actor == scene.GetRootLayer());