From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Tue, 23 Nov 2021 08:59:20 +0000 (+0000)
Subject: Merge "[ATSPI] Hypertext and Hyperlink interface support - dbus glue-code" into devel... 
X-Git-Tag: dali_2.1.0~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=262b8e9f43b6b9ef80e5e1bd4c7096fe9141ec08;hp=-c;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

Merge "[ATSPI] Hypertext and Hyperlink interface support - dbus glue-code" into devel/master
---

262b8e9f43b6b9ef80e5e1bd4c7096fe9141ec08
diff --combined dali/internal/accessibility/bridge/accessible.cpp
index d5459d1,52fa3f4..7d6010e
--- a/dali/internal/accessibility/bridge/accessible.cpp
+++ b/dali/internal/accessibility/bridge/accessible.cpp
@@@ -59,6 -59,14 +59,14 @@@ std::vector<std::string> Accessible::Ge
    {
      tmp.push_back(AtspiDbusInterfaceSelection);
    }
+   if(dynamic_cast<Hypertext*>(this))
+   {
+     tmp.push_back(AtspiDbusInterfaceHypertext);
+   }
+   if(dynamic_cast<Hyperlink*>(this))
+   {
+     tmp.push_back(AtspiDbusInterfaceHyperlink);
+   }
    return tmp;
  }
  
@@@ -237,12 -245,13 +245,12 @@@ void Accessible::NotifyAccessibilitySta
  {
    if(auto data = GetBridgeData())
    {
 -    auto currentState = GetStates() & states;
 -    for(auto i = 0u; i < currentState.size(); i++)
 +    for(auto i = 0u; i < static_cast<unsigned int>(Dali::Accessibility::State::MAX_COUNT); i++)
      {
        auto index = static_cast<Dali::Accessibility::State>(i);
 -      if(currentState[index])
 +      if(states[index])
        {
 -        data->mBridge->EmitStateChanged(this, index, 1, 0);
 +        data->mBridge->EmitStateChanged(this, index, GetStates()[index], 0);
        }
      }