X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fcontrol%2Fcontrol-data-impl.h;h=31815f650ab4ff87563574c80efe35ad894493c8;hb=refs%2Fheads%2Fdevel%2Flayout-fw;hp=a0ff3d1f4a2e3ccbe4675d638ae2218c28af365b;hpb=e37f48bb34e81585a6ed436bd7a2f9dce02c19f5;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/control/control-data-impl.h b/dali-toolkit/internal/controls/control/control-data-impl.h
index a0ff3d1..31815f6 100755
--- a/dali-toolkit/internal/controls/control/control-data-impl.h
+++ b/dali-toolkit/internal/controls/control/control-data-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_CONTROL_DATA_IMPL_H
 
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@
 #include <dali-toolkit/internal/visuals/visual-resource-observer.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali/devel-api/common/owner-container.h>
+#include <dali-toolkit/devel-api/layouting/layout-base-impl.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-base.h>
 #include <dali-toolkit/internal/controls/tooltip/tooltip.h>
 #include <dali-toolkit/internal/builder/style.h>
@@ -83,7 +84,7 @@ public:
 
   /**
    * @brief Constructor.
-   * @param[in] controlImpl The control which own this implementation
+   * @param[in] controlImpl The control which owns this implementation
    */
   Impl( Control& controlImpl );
 
@@ -185,6 +186,16 @@ public:
   Toolkit::Visual::ResourceStatus GetVisualResourceStatus( Property::Index index ) const;
 
   /**
+   * @param[in,out] animation Handle to existing animation, or an empty handle that
+   * can be set to a New animation if createAnimation is true
+   * @param[in] transitionData The transition data describing the animation
+   * @param[in] createAnimation True if the animation should be created
+   */
+  void AddTransitions( Dali::Animation& animation,
+                       const Toolkit::TransitionData& transitionData,
+                       bool createAnimation = false );
+
+  /**
    * @copydoc Dali::Toolkit::DevelControl::CreateTransition()
    */
   Dali::Animation CreateTransition( const Toolkit::TransitionData& transitionData );
@@ -313,6 +324,19 @@ public:
    */
   bool FilterKeyEvent( const KeyEvent& event );
 
+  /**
+   * @brief Get the layout associated with this control, if any.
+   *
+   * @return A pointer to the layout, or NULL.
+   */
+  Toolkit::Internal::LayoutBasePtr GetLayout() const;
+
+  /**
+   * @brief Set the layout on this control.
+   * @param[in] layout Pointer to the layout
+   */
+  void SetLayout( Toolkit::Internal::LayoutBase& layout );
+
 private:
 
   /**
@@ -358,6 +382,9 @@ public:
   DevelControl::State mState;
   std::string mSubStateName;
 
+  // Layout
+  Toolkit::Internal::LayoutBasePtr mLayout;
+
   int mLeftFocusableActorId;       ///< Actor ID of Left focusable control.
   int mRightFocusableActorId;      ///< Actor ID of Right focusable control.
   int mUpFocusableActorId;         ///< Actor ID of Up focusable control.
@@ -391,6 +418,7 @@ public:
 
   RegisteredVisualContainer mRemoveVisuals;         ///< List of visuals that are being replaced by another visual once ready
 
+
   // Properties - these need to be members of Internal::Control::Impl as they access private methods/data of Internal::Control and Internal::Control::Impl.
   static const PropertyRegistration PROPERTY_1;
   static const PropertyRegistration PROPERTY_2;