Remove Constraints from Cluster,ToolBar,View & ImageView

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

diff --git a/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.h b/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.h
index 08997b0..a1c8285 100644 (file)
--- a/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.h
+++ b/optional/dali-toolkit/internal/controls/image-view/masked-image-view-impl.h
@@ -18,8 +18,12 @@
  *
  */
 
+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/render-tasks/render-task.h>
+#include <dali/public-api/images/frame-buffer-image.h>
+
 // INTERNAL INCLUDES
-#include <dali/dali.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/image-view/masked-image-view.h>
 
@@ -35,7 +39,7 @@ namespace Internal
 /**
  * @copydoc Dali::Toolkit::MaskedImageView
  */
-class MaskedImageView : public ControlImpl
+class MaskedImageView : public Control
 {
 public:
 
@@ -131,14 +135,6 @@ public:
   ImageRotation GetSourceRotation() const;
 
   /**
-   * @copydoc Dali::Toolkit::MaskedImageView::RenderFinishedSignal
-   */
-  Dali::RenderTask::RenderTaskSignalV2& RenderFinishedSignal()
-  {
-    return mRenderTask.FinishedSignal();
-  }
-
-  /**
    * @copydoc Dali::Toolkit::MaskedImageView::MaskFinishedSignal
    */
   Dali::Toolkit::MaskedImageView::MaskedImageViewSignal& MaskFinishedSignal();
@@ -153,12 +149,12 @@ protected:
   /**
    * Helper for edit mode.
    */
-  void OnPan( Actor source, PanGesture gesture );
+  void OnPan( Actor source, const PanGesture& gesture );
 
   /**
    * Helper for edit mode.
    */
-  void OnPinch( Actor actor, PinchGesture pinch );
+  void OnPinch( Actor actor, const PinchGesture& pinch );
 
   /**
    * Construct a new MaskedImageView.
@@ -189,6 +185,12 @@ protected:
    */
   virtual ~MaskedImageView();
 
+  /**
+   *
+   * @copydoc Toolkit::Control::OnControlSizeSet( const Vector3& targetSize )
+   */
+  virtual void OnControlSizeSet( const Vector3& targetSize );
+
 private:
 
   // Undefined