Turned off Layout logging by default

Extended layouting logging to show when measures happen

Change-Id: Ifb2fd075162af175e3982da19ef8ef022e707dd1

diff --git a/dali-toolkit/devel-api/layouting/layout-group-impl.cpp b/dali-toolkit/devel-api/layouting/layout-group-impl.cpp
index d9ff6ff..d6ab337 100644 (file)
--- a/dali-toolkit/devel-api/layouting/layout-group-impl.cpp
+++ b/dali-toolkit/devel-api/layouting/layout-group-impl.cpp
@@ -31,7 +31,7 @@
 namespace
 {
 #if defined(DEBUG_ENABLED)
 namespace
 {
 #if defined(DEBUG_ENABLED)

-Debug::Filter* gLogFilter = Debug::Filter::New( Debug::Concise, false, "LOG_LAYOUT" );
+Debug::Filter* gLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_LAYOUT" );

 #endif
 }
 
 #endif
 }
 

diff --git a/dali-toolkit/devel-api/layouting/layout-item-impl.cpp b/dali-toolkit/devel-api/layouting/layout-item-impl.cpp
index 5336a7f..f7a6119 100644 (file)
--- a/dali-toolkit/devel-api/layouting/layout-item-impl.cpp
+++ b/dali-toolkit/devel-api/layouting/layout-item-impl.cpp
@@ -26,7 +26,7 @@ namespace
 {
 
 #if defined(DEBUG_ENABLED)
 {
 
 #if defined(DEBUG_ENABLED)

-Debug::Filter* gLayoutFilter = Debug::Filter::New( Debug::Verbose, false, "LOG_LAYOUT" );
+Debug::Filter* gLayoutFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_LAYOUT" );

 #endif
 
 const char* WIDTH_SPECIFICATION_NAME( "widthSpecification" );
 #endif
 
 const char* WIDTH_SPECIFICATION_NAME( "widthSpecification" );


@@ -140,6 +140,8 @@ void LayoutItem::Measure( MeasureSpec widthMeasureSpec, MeasureSpec heightMeasur
 
   const bool needsLayout = specChanged && ( !isSpecExactly || !matchesSpecSize );
 
 
   const bool needsLayout = specChanged && ( !isSpecExactly || !matchesSpecSize );
 

+  DALI_LOG_STREAM( gLayoutFilter, Debug::Verbose, "LayoutItem::Measure("<<widthMeasureSpec<<", "<<heightMeasureSpec<<") Owner:"<<Actor::DownCast(GetOwner()).GetName() <<"  forceLayout="<<forceLayout<<", specChanged="<<specChanged<<", isSpecExactly="<<isSpecExactly<<", matchesSpecSize="<<matchesSpecSize<<", needsLayout="<<needsLayout <<std::endl <<(forceLayout||needsLayout?"  Remeasuring":"  NoChange"));
+

   if( forceLayout || needsLayout )
   {
     mImpl->ClearPrivateFlag( Impl::PRIVATE_FLAG_MEASURED_DIMENSION_SET );
   if( forceLayout || needsLayout )
   {
     mImpl->ClearPrivateFlag( Impl::PRIVATE_FLAG_MEASURED_DIMENSION_SET );

diff --git a/dali-toolkit/internal/layouting/absolute-layout-impl.cpp b/dali-toolkit/internal/layouting/absolute-layout-impl.cpp
index abe424c..3f499ef 100644 (file)
--- a/dali-toolkit/internal/layouting/absolute-layout-impl.cpp
+++ b/dali-toolkit/internal/layouting/absolute-layout-impl.cpp
@@ -28,7 +28,7 @@
 namespace
 {
 #if defined(DEBUG_ENABLED)
 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
 }
 
 #endif
 }
 

diff --git a/dali-toolkit/internal/layouting/flex-layout-impl.cpp b/dali-toolkit/internal/layouting/flex-layout-impl.cpp
index 7bba696..8766c58 100644 (file)
--- a/dali-toolkit/internal/layouting/flex-layout-impl.cpp
+++ b/dali-toolkit/internal/layouting/flex-layout-impl.cpp
@@ -30,7 +30,7 @@
 #include <dali-toolkit/third-party/yoga/YGNode.h>
 
 #if defined(DEBUG_ENABLED)
 #include <dali-toolkit/third-party/yoga/YGNode.h>
 
 #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
 #endif
 
 namespace Dali


@@ -191,7 +191,7 @@ void FlexLayout::OnMeasure( MeasureSpec widthMeasureSpec, MeasureSpec heightMeas
   oss << "FlexLayout::OnMeasure  ";
   if( actor )
   {
   oss << "FlexLayout::OnMeasure  ";
   if( actor )
   {

-       oss << "Actor Id:" << actor.GetId() << " Name:" << actor.GetName() << " Layout direction:" << actor.GetProperty( Actor::Property::LAYOUT_DIRECTION ).Get<int>() << " ";
+    oss << "Actor Id:" << actor.GetId() << " Name:" << actor.GetName() << " Layout direction:" << actor.GetProperty( Actor::Property::LAYOUT_DIRECTION ).Get<int>() << " ";

   }
   oss << "widthMeasureSpec:" << widthMeasureSpec << " heightMeasureSpec:" << heightMeasureSpec << std::endl;
   DALI_LOG_INFO( gLogFilter, Debug::Concise, oss.str().c_str() );
   }
   oss << "widthMeasureSpec:" << widthMeasureSpec << " heightMeasureSpec:" << heightMeasureSpec << std::endl;
   DALI_LOG_INFO( gLogFilter, Debug::Concise, oss.str().c_str() );

diff --git a/dali-toolkit/internal/layouting/hbox-layout-impl.cpp b/dali-toolkit/internal/layouting/hbox-layout-impl.cpp
index 0caf08d..7d9d094 100644 (file)
--- a/dali-toolkit/internal/layouting/hbox-layout-impl.cpp
+++ b/dali-toolkit/internal/layouting/hbox-layout-impl.cpp
@@ -29,7 +29,7 @@
 namespace
 {
 #if defined(DEBUG_ENABLED)
 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
 }
 
 #endif
 }
 

diff --git a/dali-toolkit/internal/layouting/layout-controller-debug.cpp b/dali-toolkit/internal/layouting/layout-controller-debug.cpp
index 85057c1..4b8f63e 100644 (file)
--- a/dali-toolkit/internal/layouting/layout-controller-debug.cpp
+++ b/dali-toolkit/internal/layouting/layout-controller-debug.cpp
@@ -27,7 +27,7 @@ namespace Internal
 {
 
 #if defined( DEBUG_ENABLED )
 {
 
 #if defined( DEBUG_ENABLED )

-Debug::Filter* gLogFilter = Debug::Filter::New( Debug::Verbose, false, "LOG_LAYOUT_TREE" );
+Debug::Filter* gLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_LAYOUT_TREE" );

 
 
 void GetLayoutMeasureStateString( std::ostringstream& oss, LayoutItemPtr layout )
 
 
 void GetLayoutMeasureStateString( std::ostringstream& oss, LayoutItemPtr layout )

diff --git a/dali-toolkit/internal/layouting/layout-controller-impl.cpp b/dali-toolkit/internal/layouting/layout-controller-impl.cpp
index 0ca1847..1f12c3f 100644 (file)
--- a/dali-toolkit/internal/layouting/layout-controller-impl.cpp
+++ b/dali-toolkit/internal/layouting/layout-controller-impl.cpp
@@ -29,7 +29,7 @@ namespace
 {
 
 #if defined(DEBUG_ENABLED)
 {
 
 #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
 
 }
 #endif
 
 }

diff --git a/dali-toolkit/internal/layouting/vbox-layout-impl.cpp b/dali-toolkit/internal/layouting/vbox-layout-impl.cpp
index 3097a21..79d2f54 100644 (file)
--- a/dali-toolkit/internal/layouting/vbox-layout-impl.cpp
+++ b/dali-toolkit/internal/layouting/vbox-layout-impl.cpp
@@ -29,7 +29,7 @@
 namespace
 {
 #if defined(DEBUG_ENABLED)
 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
 }
 
 #endif
 }