X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fcontrols%2Fcontrol-devel.cpp;h=157051ba1705204de7a769897c598f8364202040;hb=b8da2e53925b9abb9fa362560069e8ca4aa62f81;hp=a855b2ddc92fc1dc20c4351a68e2d1fa22a652ff;hpb=1fe6286be11679b2f5c14a60636ae9cb486570e4;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/devel-api/controls/control-devel.cpp b/dali-toolkit/devel-api/controls/control-devel.cpp
index a855b2d..157051b 100644
--- a/dali-toolkit/devel-api/controls/control-devel.cpp
+++ b/dali-toolkit/devel-api/controls/control-devel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/visual-factory/transition-data.h>
 #include <dali-toolkit/internal/controls/control/control-data-impl.h>
-#include <dali-toolkit/public-api/controls/control.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
+#include <dali-toolkit/public-api/controls/control.h>
 
 namespace Dali
 {
@@ -115,230 +115,237 @@ VisualEventSignalType& VisualEventSignal(Control control)
   return controlDataImpl.VisualEventSignal();
 }
 
-static Toolkit::Internal::Control::Impl *GetControlImplementationIfAny( Dali::Actor actor)
+Dali::Property GetVisualProperty(Control control, Dali::Property::Index index, Dali::Property::Key visualPropertyKey)
+{
+  Internal::Control&       internalControl = Toolkit::Internal::GetImplementation(control);
+  Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get(internalControl);
+  return controlDataImpl.GetVisualProperty(index, visualPropertyKey);
+}
+
+static Toolkit::Internal::Control::Impl* GetControlImplementationIfAny(Dali::Actor actor)
 {
-  Dali::Toolkit::Control c = Toolkit::Control::DownCast( actor );
-  if ( c )
+  Dali::Toolkit::Control c = Toolkit::Control::DownCast(actor);
+  if(c)
   {
-    auto &impl1 = Toolkit::Internal::GetImplementation( c );
-    auto &impl2 = Toolkit::Internal::Control::Impl::Get( impl1 );
+    auto& impl1 = Toolkit::Internal::GetImplementation(c);
+    auto& impl2 = Toolkit::Internal::Control::Impl::Get(impl1);
     return &impl2;
   }
   return nullptr;
 }
 
-Toolkit::DevelControl::AccessibilityActivateSignalType &AccessibilityActivateSignal( Toolkit::Control control )
+Toolkit::DevelControl::AccessibilityActivateSignalType& AccessibilityActivateSignal(Toolkit::Control control)
 {
-  auto ac = GetControlImplementationIfAny ( control );
+  auto ac = GetControlImplementationIfAny(control);
   return ac->mAccessibilityActivateSignal;
 }
 
-Toolkit::DevelControl::AccessibilityReadingSkippedSignalType &AccessibilityReadingSkippedSignal( Toolkit::Control control )
+Toolkit::DevelControl::AccessibilityReadingSkippedSignalType& AccessibilityReadingSkippedSignal(Toolkit::Control control)
 {
-  auto ac = GetControlImplementationIfAny ( control );
+  auto ac = GetControlImplementationIfAny(control);
   return ac->mAccessibilityReadingSkippedSignal;
 }
 
-Toolkit::DevelControl::AccessibilityReadingPausedSignalType &AccessibilityReadingPausedSignal( Toolkit::Control control )
+Toolkit::DevelControl::AccessibilityReadingPausedSignalType& AccessibilityReadingPausedSignal(Toolkit::Control control)
 {
-  auto ac = GetControlImplementationIfAny ( control );
+  auto ac = GetControlImplementationIfAny(control);
   return ac->mAccessibilityReadingPausedSignal;
 }
 
-Toolkit::DevelControl::AccessibilityReadingResumedSignalType &AccessibilityReadingResumedSignal( Toolkit::Control control )
+Toolkit::DevelControl::AccessibilityReadingResumedSignalType& AccessibilityReadingResumedSignal(Toolkit::Control control)
 {
-  auto ac = GetControlImplementationIfAny ( control );
+  auto ac = GetControlImplementationIfAny(control);
   return ac->mAccessibilityReadingResumedSignal;
 }
 
-Toolkit::DevelControl::AccessibilityReadingCancelledSignalType &AccessibilityReadingCancelledSignal( Toolkit::Control control )
+Toolkit::DevelControl::AccessibilityReadingCancelledSignalType& AccessibilityReadingCancelledSignal(Toolkit::Control control)
 {
-  auto ac = GetControlImplementationIfAny ( control );
+  auto ac = GetControlImplementationIfAny(control);
   return ac->mAccessibilityReadingCancelledSignal;
 }
 
-Toolkit::DevelControl::AccessibilityReadingStoppedSignalType &AccessibilityReadingStoppedSignal( Toolkit::Control control )
+Toolkit::DevelControl::AccessibilityReadingStoppedSignalType& AccessibilityReadingStoppedSignal(Toolkit::Control control)
 {
-  auto ac = GetControlImplementationIfAny ( control );
+  auto ac = GetControlImplementationIfAny(control);
   return ac->mAccessibilityReadingStoppedSignal;
 }
 
-Toolkit::DevelControl::AccessibilityGetNameSignalType &AccessibilityGetNameSignal( Toolkit::Control control )
+Toolkit::DevelControl::AccessibilityGetNameSignalType& AccessibilityGetNameSignal(Toolkit::Control control)
 {
-  auto ac = GetControlImplementationIfAny ( control );
+  auto ac = GetControlImplementationIfAny(control);
   return ac->mAccessibilityGetNameSignal;
 }
 
-Toolkit::DevelControl::AccessibilityGetDescriptionSignalType &AccessibilityGetDescriptionSignal( Toolkit::Control control )
+Toolkit::DevelControl::AccessibilityGetDescriptionSignalType& AccessibilityGetDescriptionSignal(Toolkit::Control control)
 {
-  auto ac = GetControlImplementationIfAny ( control );
+  auto ac = GetControlImplementationIfAny(control);
   return ac->mAccessibilityGetDescriptionSignal;
 }
 
-Toolkit::DevelControl::AccessibilityDoGestureSignalType &AccessibilityDoGestureSignal( Toolkit::Control control )
+Toolkit::DevelControl::AccessibilityDoGestureSignalType& AccessibilityDoGestureSignal(Toolkit::Control control)
 {
-  auto ac = GetControlImplementationIfAny ( control );
+  auto ac = GetControlImplementationIfAny(control);
   return ac->mAccessibilityDoGestureSignal;
 }
 
-void AppendAccessibilityRelation( Dali::Actor control, Actor destination, Dali::Accessibility::RelationType relation)
+void AppendAccessibilityRelation(Dali::Actor control, Actor destination, Dali::Accessibility::RelationType relation)
 {
-  if ( auto ac = GetControlImplementationIfAny ( control ) )
+  if(auto ac = GetControlImplementationIfAny(control))
   {
     auto index = static_cast<Dali::Property::Array::SizeType>(relation);
-    if (index >= ac->mAccessibilityRelations.size())
+    if(index >= ac->mAccessibilityRelations.size())
     {
-        DALI_LOG_ERROR( "Relation index exceeds vector size." );
-        return;
+      DALI_LOG_ERROR("Relation index exceeds vector size.");
+      return;
     }
 
     auto obj = ac->GetAccessibilityObject(destination);
-    if (obj)
+    if(obj)
       ac->mAccessibilityRelations[index].push_back(obj->GetAddress());
   }
 }
 
-void RemoveAccessibilityRelation( Dali::Actor control, Actor destination, Dali::Accessibility::RelationType relation)
+void RemoveAccessibilityRelation(Dali::Actor control, Actor destination, Dali::Accessibility::RelationType relation)
 {
-  if ( auto ac = GetControlImplementationIfAny ( control ) )
+  if(auto ac = GetControlImplementationIfAny(control))
   {
     auto index = static_cast<Dali::Property::Array::SizeType>(relation);
-    if (index >= ac->mAccessibilityRelations.size())
+    if(index >= ac->mAccessibilityRelations.size())
     {
-        DALI_LOG_ERROR( "Relation index exceeds vector size." );
-        return;
+      DALI_LOG_ERROR("Relation index exceeds vector size.");
+      return;
     }
 
     auto obj = ac->GetAccessibilityObject(destination);
-    if (!obj)
+    if(!obj)
       return;
 
     auto address = obj->GetAddress();
 
-    auto &targets = ac->mAccessibilityRelations[index];
-    for (auto i = 0u; i < targets.size(); ++i) {
-        if (targets[i].ToString() == address.ToString())
-        {
-            targets[i] = targets.back();
-            targets.erase(targets.end() - 1);
-        }
+    auto& targets = ac->mAccessibilityRelations[index];
+    for(auto i = 0u; i < targets.size(); ++i)
+    {
+      if(targets[i].ToString() == address.ToString())
+      {
+        targets[i] = targets.back();
+        targets.erase(targets.end() - 1);
+      }
     }
   }
 }
 
-std::vector<std::vector<Accessibility::Address>> GetAccessibilityRelations( Dali::Actor control )
+std::vector<std::vector<Accessibility::Address>> GetAccessibilityRelations(Dali::Actor control)
 {
-  if ( auto ac = GetControlImplementationIfAny ( control ) )
+  if(auto ac = GetControlImplementationIfAny(control))
   {
     return ac->mAccessibilityRelations;
   }
   return {};
 }
 
-void ClearAccessibilityRelations( Dali::Actor control )
+void ClearAccessibilityRelations(Dali::Actor control)
 {
-  if ( auto ac = GetControlImplementationIfAny ( control ) )
+  if(auto ac = GetControlImplementationIfAny(control))
   {
-    for (auto &it : ac->mAccessibilityRelations)
+    for(auto& it : ac->mAccessibilityRelations)
       it.clear();
   }
 }
 
-void SetAccessibilityConstructor( Dali::Actor control,
-        std::function< std::unique_ptr< Dali::Accessibility::Accessible >( Dali::Actor ) > constructor )
+void SetAccessibilityConstructor(Dali::Actor                                                                  control,
+                                 std::function<std::unique_ptr<Dali::Accessibility::Accessible>(Dali::Actor)> constructor)
 {
-  if ( auto ac = GetControlImplementationIfAny ( control ) )
+  if(auto ac = GetControlImplementationIfAny(control))
   {
     ac->accessibilityConstructor = constructor;
   }
 }
 
-void AppendAccessibilityAttribute( Dali::Actor control, const std::string& key,
-                                         const std::string value )
+void AppendAccessibilityAttribute(Dali::Actor control, const std::string& key, const std::string value)
 {
-  if ( auto ac = GetControlImplementationIfAny ( control ) )
+  if(auto ac = GetControlImplementationIfAny(control))
   {
-    ac->AppendAccessibilityAttribute( key, value );
+    ac->AppendAccessibilityAttribute(key, value);
   }
 }
 
-void RemoveAccessibilityAttribute( Dali::Actor control, const std::string& key )
+void RemoveAccessibilityAttribute(Dali::Actor control, const std::string& key)
 {
-  if ( auto ac = GetControlImplementationIfAny ( control ) )
+  if(auto ac = GetControlImplementationIfAny(control))
   {
-    ac->RemoveAccessibilityAttribute( key );
+    ac->RemoveAccessibilityAttribute(key);
   }
 }
 
-void ClearAccessibilityAttributes( Dali::Actor control )
+void ClearAccessibilityAttributes(Dali::Actor control)
 {
-  if ( auto ac = GetControlImplementationIfAny ( control ) )
+  if(auto ac = GetControlImplementationIfAny(control))
   {
     ac->ClearAccessibilityAttributes();
   }
 }
 
-void SetAccessibilityReadingInfoType( Dali::Actor control, const Dali::Accessibility::ReadingInfoTypes types )
+void SetAccessibilityReadingInfoType(Dali::Actor control, const Dali::Accessibility::ReadingInfoTypes types)
 {
-  if ( auto ac = GetControlImplementationIfAny ( control ) )
+  if(auto ac = GetControlImplementationIfAny(control))
   {
-    ac->SetAccessibilityReadingInfoType( types );
+    ac->SetAccessibilityReadingInfoType(types);
   }
 }
 
-Dali::Accessibility::ReadingInfoTypes GetAccessibilityReadingInfoType(Dali::Actor control )
+Dali::Accessibility::ReadingInfoTypes GetAccessibilityReadingInfoType(Dali::Actor control)
 {
-  if ( auto ac = GetControlImplementationIfAny ( control ) )
+  if(auto ac = GetControlImplementationIfAny(control))
   {
     return ac->GetAccessibilityReadingInfoType();
   }
   return {};
 }
 
-bool ClearAccessibilityHighlight( Dali::Actor control )
+bool ClearAccessibilityHighlight(Dali::Actor control)
 {
-  if ( auto ac = GetControlImplementationIfAny ( control ) )
+  if(auto ac = GetControlImplementationIfAny(control))
   {
-    auto ptr = dynamic_cast<Dali::Accessibility::Component*>( ac->GetAccessibilityObject() );
-    if( ptr )
+    auto ptr = dynamic_cast<Dali::Accessibility::Component*>(ac->GetAccessibilityObject());
+    if(ptr)
       return ptr->ClearHighlight();
   }
   return false;
 }
 
-bool GrabAccessibilityHighlight( Dali::Actor control )
+bool GrabAccessibilityHighlight(Dali::Actor control)
 {
-  if ( auto ac = GetControlImplementationIfAny ( control ) )
+  if(auto ac = GetControlImplementationIfAny(control))
   {
-    auto ptr = dynamic_cast<Dali::Accessibility::Component*>( ac->GetAccessibilityObject() );
-    if( ptr )
+    auto ptr = dynamic_cast<Dali::Accessibility::Component*>(ac->GetAccessibilityObject());
+    if(ptr)
       return ptr->GrabHighlight();
   }
   return false;
 }
 
-Dali::Accessibility::States GetAccessibilityStates( Dali::Actor control )
+Dali::Accessibility::States GetAccessibilityStates(Dali::Actor control)
 {
-  if ( auto ac = GetControlImplementationIfAny ( control ) )
+  if(auto ac = GetControlImplementationIfAny(control))
   {
-    auto ptr = dynamic_cast<Dali::Accessibility::Component*>( ac->GetAccessibilityObject() );
+    auto ptr = dynamic_cast<Dali::Accessibility::Component*>(ac->GetAccessibilityObject());
     if(ptr)
       return ptr->GetStates();
   }
   return {};
 }
 
-void NotifyAccessibilityStateChange( Dali::Actor control, Dali::Accessibility::States states, bool doRecursive )
+void NotifyAccessibilityStateChange(Dali::Actor control, Dali::Accessibility::States states, bool doRecursive)
 {
-  if ( auto ac = GetControlImplementationIfAny ( control ) )
+  if(auto ac = GetControlImplementationIfAny(control))
   {
-    ac->GetAccessibilityObject()->NotifyAccessibilityStateChange( std::move(states), doRecursive );
+    ac->GetAccessibilityObject()->NotifyAccessibilityStateChange(std::move(states), doRecursive);
   }
 }
 
-Dali::Accessibility::Accessible *GetBoundAccessibilityObject( Dali::Actor control )
+Dali::Accessibility::Accessible* GetBoundAccessibilityObject(Dali::Actor control)
 {
-  return Dali::Accessibility::Accessible::Get( control );
+  return Dali::Accessibility::Accessible::Get(control);
 }
 
 } // namespace DevelControl