Merge "Parent of TextLabel does not resize when text changes" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / layouting / layout-item-data-impl.h

diff --git a/dali-toolkit/internal/layouting/layout-item-data-impl.h b/dali-toolkit/internal/layouting/layout-item-data-impl.h
index 0e68977..0b415ad 100644 (file)
--- a/dali-toolkit/internal/layouting/layout-item-data-impl.h
+++ b/dali-toolkit/internal/layouting/layout-item-data-impl.h
@@ -80,9 +80,13 @@ public:
 
   static bool sUseZeroUnspecifiedMeasureSpec;
 
+  // Custom transitions
   LayoutTransitionDataPtr mOnChildAddTransitionData;
   LayoutTransitionDataPtr mOnChildRemoveTransitionData;
+  LayoutTransitionDataPtr mOnChildFocusTransitionData;
   LayoutTransitionDataPtr mOnOwnerSetTransitionData;
+  LayoutTransitionDataPtr mOnLayoutChangeTransitionData;
+  // Default transition
   LayoutTransitionDataPtr mDefaultTransitionData;
 
   // To pass layout data during perform layout