X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Flayouting%2Flayout-controller-impl.cpp;h=0e8d92569f580372845ab9764cc74f7459595dff;hp=30beba45345a94d41905e76f3c982dfe49f6bb48;hb=895e2909bd541d9f987923c40dabd9417f66325b;hpb=16634ab902b66b0ba2f3f39af8ff6ed25b5f7115

diff --git a/dali-toolkit/internal/layouting/layout-controller-impl.cpp b/dali-toolkit/internal/layouting/layout-controller-impl.cpp
index 30beba4..0e8d925 100644
--- a/dali-toolkit/internal/layouting/layout-controller-impl.cpp
+++ b/dali-toolkit/internal/layouting/layout-controller-impl.cpp
@@ -25,10 +25,15 @@
 
 using namespace Dali;
 
+namespace
+{
+
 #if defined(DEBUG_ENABLED)
-static Debug::Filter* gLogFilter = Debug::Filter::New( Debug::Concise, false, "LOG_LAYOUT" );
+static Debug::Filter* gLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_LAYOUT" );
 #endif
 
+}
+
 namespace Dali
 {
 namespace Toolkit
@@ -49,13 +54,13 @@ void LayoutController::Initialize()
 {
 }
 
-void LayoutController::RequestLayout( LayoutBase& layoutBase )
+void LayoutController::RequestLayout( LayoutItem& LayoutItem )
 {
   DALI_LOG_INFO( gLogFilter, Debug::Concise, "LayoutController::RequestLayout\n" );
   mLayoutRequested = true;
 
   // Go up the tree and mark all parents to relayout
-  LayoutParent* layoutParent = layoutBase.GetParent();
+  LayoutParent* layoutParent = LayoutItem.GetParent();
   if( layoutParent )
   {
     LayoutGroup& layoutGroup = static_cast< LayoutGroup& >( *layoutParent );
@@ -105,9 +110,11 @@ void LayoutController::MeasureHierarchy( Actor root, MeasureSpec widthSpec, Meas
   Toolkit::Control control = Toolkit::Control::DownCast( root );
   if( control )
   {
+    DALI_LOG_INFO( gLogFilter, Debug::Verbose, "LayoutController::Measuring control\n" );
     Internal::Control& controlImpl = GetImplementation( control );
+
     Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get( controlImpl );
-    LayoutBasePtr layout = controlDataImpl.GetLayout();
+    LayoutItemPtr layout = controlDataImpl.GetLayout();
 
     if( layout )
     {
@@ -116,6 +123,7 @@ void LayoutController::MeasureHierarchy( Actor root, MeasureSpec widthSpec, Meas
   }
   else
   {
+    DALI_LOG_INFO( gLogFilter, Debug::Verbose, "LayoutController::Measuring (%u) children\n", root.GetChildCount() );
     // Depth first descent through actor children
     for( unsigned int i = 0, count = root.GetChildCount(); i < count; ++i )
     {
@@ -130,17 +138,20 @@ void LayoutController::PerformLayout( Actor root, int left, int top, int right,
   Toolkit::Control control = Toolkit::Control::DownCast( root );
   if( control )
   {
+    DALI_LOG_INFO( gLogFilter, Debug::Verbose, "LayoutController::PerformLayout on control[%s]\n", control.GetName().c_str() );
     Internal::Control& controlImpl = GetImplementation( control );
     Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get( controlImpl );
-    LayoutBasePtr layout = controlDataImpl.GetLayout();
+    LayoutItemPtr layout = controlDataImpl.GetLayout();
 
     if( layout )
     {
+      DALI_LOG_INFO( gLogFilter, Debug::Verbose, "LayoutController::PerformLayout on layout\n" );
       layout->Layout( left, top, right, bottom );
     }
   }
   else
   {
+    DALI_LOG_INFO( gLogFilter, Debug::Verbose, "LayoutController::PerformLayout (%u) children\n", root.GetChildCount() );
     // Depth first descent through actor children
     for( unsigned int i = 0, count = root.GetChildCount(); i < count; ++i )
     {