fixing some of the comments and changing copy-by-value to by reference in size negoti...

[platform/core/uifw/dali-toolkit.git] / optional / dali-toolkit / internal / controls / view / view-impl.h

diff --git a/optional/dali-toolkit/internal/controls/view/view-impl.h b/optional/dali-toolkit/internal/controls/view/view-impl.h
index 7843583..5352afe 100644 (file)
--- a/optional/dali-toolkit/internal/controls/view/view-impl.h
+++ b/optional/dali-toolkit/internal/controls/view/view-impl.h
@@ -19,7 +19,9 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/dali.h>
+#include <dali/public-api/actors/layer.h>
+#include <dali/public-api/animation/animation.h>
+#include <dali/public-api/common/map-wrapper.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
@@ -40,7 +42,7 @@ namespace Internal
  * View is a control to add layers and a background.
  * @see Dali::Toolkit::View for more details.
  */
-class View : public ControlImpl
+class View : public Control
 {
 private:
   typedef std::map<unsigned int,Layer> LayerContainer;
@@ -115,7 +117,7 @@ public:
   /**
    * @copydoc Dali::Toolkit::View::AnimationStartedSignalOrientation()
    */
-  Toolkit::View::OrientationAnimationStartedSignalV2& OrientationAnimationStartedSignal();
+  Toolkit::View::OrientationAnimationStartedSignalType& OrientationAnimationStartedSignal();
 
   /**
    * Connects a callback function with the object's signals.
@@ -128,13 +130,19 @@ public:
    */
   static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor );
 
-private: // From ControlImpl
+private: // From Control
 
   /**
    * @copydoc Toolkit::Control::OnInitialize()
    */
   virtual void OnInitialize();
 
+  /**
+   *
+   * @copydoc Toolkit::Control::OnControlSizeSet( const Vector3& targetSize )
+   */
+  virtual void OnControlSizeSet( const Vector3& targetSize );
+
 private:
 
 
@@ -172,8 +180,9 @@ private:
   Animation      mRotateAnimation;        ///< The animation which rotates the view (and all layers added to it)
   float          mOrientationFunction[4]; ///< The orientation function used to transform from degrees to the internal orientation.
   bool           mAutoRotateEnabled;      ///< Whether the view rotates if the OrientationChanged method is called.
+  Vector3        mViewSize;               ///< The Control Size
 
-  Toolkit::View::OrientationAnimationStartedSignalV2 mOrientationAnimationStartedSignalV2;
+  Toolkit::View::OrientationAnimationStartedSignalType mOrientationAnimationStartedSignal;
 };
 
 } // namespace Internal