Additional logs

Change-Id: I0fc4da560b764fa3453adda8b66ba1cf247cf2b9

diff --git a/dali-toolkit/devel-api/controls/control-devel.cpp b/dali-toolkit/devel-api/controls/control-devel.cpp
index 86881d3..3cf9690 100644 (file)
--- a/dali-toolkit/devel-api/controls/control-devel.cpp
+++ b/dali-toolkit/devel-api/controls/control-devel.cpp
@@ -555,6 +555,8 @@ Dali::Rect<> AccessibleImpl::GetExtents(Dali::Accessibility::CoordType ctype)
   Vector2 position = Vector2(screenPosition.x - anchorPointOffSet.x,
                              screenPosition.y - anchorPointOffSet.y);
 
+  DALI_LOG_ERROR("BART GetExtents %p (%f, %f, %f, %f)", this, position.x, position.y, size.x, size.y);
+
   return {position.x, position.y, size.x, size.y};
 }
 

diff --git a/dali-toolkit/internal/controls/buttons/button-impl.cpp b/dali-toolkit/internal/controls/buttons/button-impl.cpp
index 2b830fa..9c56ae6 100644 (file)
--- a/dali-toolkit/internal/controls/buttons/button-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/button-impl.cpp
@@ -815,6 +815,7 @@ void Button::OnSetResizePolicy(ResizePolicy::Type policy, Dimension::Type dimens
 void Button::OnRelayout(const Vector2& size, RelayoutContainer& container)
 {
   DALI_LOG_INFO(gLogButtonFilter, Debug::General, "OnRelayout targetSize(%f,%f) ptr(%p) state[%d]\n", size.width, size.height, this, mButtonState);
+  DALI_LOG_ERROR("OnRelayout targetSize(%f,%f) ptr(%p) state[%d]\n", size.width, size.height, this, mButtonState);
 
   Toolkit::Visual::Base currentVisual           = DevelControl::GetVisual(*this, VISUAL_INDEX_FOR_STATE[mButtonState][FOREGROUND]);
   Toolkit::Visual::Base currentBackGroundVisual = DevelControl::GetVisual(*this, VISUAL_INDEX_FOR_STATE[mButtonState][BACKGROUND]);
@@ -829,12 +830,14 @@ void Button::OnRelayout(const Vector2& size, RelayoutContainer& container)
   if(mTextStringSetFlag)
   {
     DALI_LOG_INFO(gLogButtonFilter, Debug::General, "OnRelayout Label padding setting padding:%f,%f,%f,%f\n", mLabelPadding.y, mLabelPadding.x, mLabelPadding.width, mLabelPadding.height);
+    DALI_LOG_ERROR("OnRelayout Label padding setting padding:%f,%f,%f,%f\n", mLabelPadding.y, mLabelPadding.x, mLabelPadding.width, mLabelPadding.height);
     labelVisualPadding = mLabelPadding;
   }
 
   if(currentVisual)
   {
     DALI_LOG_INFO(gLogButtonFilter, Debug::General, "OnRelayout Foreground Visual setting padding:%f,%f,%f,%f\n", mForegroundPadding.y, mForegroundPadding.x, mForegroundPadding.width, mForegroundPadding.height);
+    DALI_LOG_ERROR("OnRelayout Foreground Visual setting padding:%f,%f,%f,%f\n", mForegroundPadding.y, mForegroundPadding.x, mForegroundPadding.width, mForegroundPadding.height);
     currentVisual.GetNaturalSize(visualSize);
     foregroundVisualPadding = mForegroundPadding;
   }
@@ -845,6 +848,7 @@ void Button::OnRelayout(const Vector2& size, RelayoutContainer& container)
                                          (foregroundVisualPadding.width + visualSize.height + foregroundVisualPadding.height));
 
   DALI_LOG_INFO(gLogButtonFilter, Debug::General, "OnRelayout visualAndPaddingSize(%f,%f)\n", visualAndPaddingSize.width, visualAndPaddingSize.height);
+  DALI_LOG_ERROR("OnRelayout visualAndPaddingSize(%f,%f)\n", visualAndPaddingSize.width, visualAndPaddingSize.height);
 
   // Text Visual should take all space available after foreground visual size and all padding is considered.
   // Remaining Space priority, Foreground padding, foreground visual, Text padding then Text visual.
@@ -911,6 +915,7 @@ void Button::OnRelayout(const Vector2& size, RelayoutContainer& container)
   if(currentBackGroundVisual)
   {
     DALI_LOG_INFO(gLogButtonFilter, Debug::General, "OnRelayout Setting visual background size to(%f,%f)\n", size.width, size.height);
+    DALI_LOG_ERROR("OnRelayout Setting visual background size to(%f,%f)\n", size.width, size.height);
 
     Property::Map visualTransform;
 
@@ -923,6 +928,7 @@ void Button::OnRelayout(const Vector2& size, RelayoutContainer& container)
   if(currentVisual)
   {
     DALI_LOG_INFO(gLogButtonFilter, Debug::General, "OnRelayout Setting visual size to(%f,%f)\n", visualSize.width, visualSize.height);
+    DALI_LOG_ERROR("OnRelayout Setting visual size to(%f,%f)\n", visualSize.width, visualSize.height);
 
     Property::Map visualTransform;
 
@@ -945,6 +951,7 @@ void Button::OnRelayout(const Vector2& size, RelayoutContainer& container)
       if(!currentVisual)
       {
         DALI_LOG_INFO(gLogButtonFilter, Debug::General, "OnRelayout Only Text\n");
+        DALI_LOG_ERROR("OnRelayout Only Text\n");
         labelPosition.x = labelVisualPadding.left;
         labelPosition.y = labelVisualPadding.height;
       }
@@ -952,8 +959,10 @@ void Button::OnRelayout(const Vector2& size, RelayoutContainer& container)
       Vector2 preSize = Vector2(static_cast<int>(remainingSpaceForText.x), static_cast<int>(remainingSpaceForText.y));
 
       DALI_LOG_INFO(gLogButtonFilter, Debug::General, "OnRelayout text Size(%f,%f) text Position(%f,%f) \n", remainingSpaceForText.width, remainingSpaceForText.height, labelPosition.x, labelPosition.y);
+      DALI_LOG_ERROR("OnRelayout text Size(%f,%f) text Position(%f,%f) \n", remainingSpaceForText.width, remainingSpaceForText.height, labelPosition.x, labelPosition.y);
 
       DALI_LOG_INFO(gLogButtonFilter, Debug::General, "OnRelayout text Size -- (%f,%f) text Position(%f,%f) \n", preSize.width, preSize.height, labelPosition.x, labelPosition.y);
+      DALI_LOG_ERROR("OnRelayout text Size -- (%f,%f) text Position(%f,%f) \n", preSize.width, preSize.height, labelPosition.x, labelPosition.y);
 
       Property::Map textVisualTransform;
       textVisualTransform.Add(Toolkit::Visual::Transform::Property::SIZE, preSize)
@@ -968,8 +977,12 @@ void Button::OnRelayout(const Vector2& size, RelayoutContainer& container)
   }
 
   DALI_LOG_INFO(gLogButtonFilter, Debug::General, "OnRelayout selected (%s) \n", IsSelected() ? "yes" : "no");
+  DALI_LOG_ERROR("OnRelayout selected (%s) \n", IsSelected() ? "yes" : "no");
 
   DALI_LOG_INFO(gLogButtonFilter, Debug::General, "OnRelayout << \n");
+  DALI_LOG_ERROR("OnRelayout << \n");
+
+  DALI_LOG_ERROR("BART OnRelayout %p (%f, %f, %f, %f)", this, visualPosition.x, visualPosition.y, visualSize.width, visualSize.height);
 }
 
 void Button::OnTap(Actor actor, const TapGesture& tap)

diff --git a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
index 513960f..6c6e5fe 100644 (file)
--- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
+++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
@@ -250,8 +250,10 @@ float ImageView::GetWidthForHeight(float height)
 void ImageView::OnRelayout(const Vector2& size, RelayoutContainer& container)
 {
   Control::OnRelayout(size, container);
+  DALI_LOG_ERROR("BART ImageView START ImageView %p size = (%f, %f)", this, size.x, size.y);
   if(mVisual)
   {
+    DALI_LOG_ERROR("BART ImageView mVisula=1");
     Property::Map transformMap = Property::Map();
 
     Extents padding = Self().GetProperty<Extents>(Toolkit::Control::Property::PADDING);
@@ -271,6 +273,7 @@ void ImageView::OnRelayout(const Vector2& size, RelayoutContainer& container)
     // remove padding from the size to know how much is left for the visual
     Vector2 finalSize   = size - Vector2(padding.start + padding.end, padding.top + padding.bottom);
     Vector2 finalOffset = Vector2(padding.start, padding.top);
+    DALI_LOG_ERROR("BART ImageView Fitting (%f, %f, %f, %f)", finalOffset.x, finalOffset.y, finalSize.x, finalSize.y);
 
     ApplyFittingMode(finalSize, naturalSize, finalOffset, zeroPadding, transformMap);
 
@@ -285,6 +288,7 @@ void ImageView::OnRelayout(const Vector2& size, RelayoutContainer& container)
       visual.SetTransformAndSize(Property::Map(), size);
     }
   }
+  DALI_LOG_ERROR("BART ImageView END");
 }
 
 void ImageView::OnResourceReady(Toolkit::Control control)