Merge "Change size for new visual using initialized transformMap when mVisual is...

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / control / control-debug.cpp

diff --git a/dali-toolkit/internal/controls/control/control-debug.cpp b/dali-toolkit/internal/controls/control/control-debug.cpp
index a359dee..bcb69ac 100644 (file)
--- a/dali-toolkit/internal/controls/control/control-debug.cpp
+++ b/dali-toolkit/internal/controls/control/control-debug.cpp
@@ -287,12 +287,12 @@ std::string DumpControl( const Internal::Control& control )
 
   std::ostringstream oss;
   oss << "{\n  ";
-  const std::string& name = control.Self().GetName();
+  const std::string& name = control.Self().GetProperty< std::string >( Dali::Actor::Property::NAME );
   if( ! name.empty() )
   {
     oss << "\"name\":\"" << name << "\",\n";
   }
-  oss << "\"id\":\"" << control.Self().GetId() << "\",\n";
+  oss << "\"id\":\"" << control.Self().GetProperty< int >( Actor::Property::ID ) << "\",\n";
   oss << "\"registeredVisuals\":\n" << controlData.mVisuals << ",\n";
   oss << "\"removeVisuals\":\n" << controlData.mRemoveVisuals << ",\n";
   oss << "\"rendererCount\":" << control.Self().GetRendererCount() << ",\n";
@@ -306,12 +306,12 @@ std::string DumpActor( Actor actor )
 {
   std::ostringstream oss;
   oss << "{\n  ";
-  const std::string& name = actor.GetName();
+  const std::string& name = actor.GetProperty< std::string >( Dali::Actor::Property::NAME );
   if( ! name.empty() )
   {
     oss << "\"name\":\"" << name << "\",\n";
   }
-  oss << "\"id\":\"" << actor.GetId() << "\",\n";
+  oss << "\"id\":\"" << actor.GetProperty< int >( Actor::Property::ID ) << "\",\n";
   oss << "\"rendererCount\":" << actor.GetRendererCount() << ",\n";
   oss << "\"properties\":\n{\n";
   Toolkit::Internal::DumpProperties( oss, actor ) << "}\n";