X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fmagnifier%2Fmagnifier-impl.h;h=c7075239289a735cfa46fe150ea97c0ce6c1d80b;hb=HEAD;hp=4def3248e036fd2c364bd1eef2667640643d47db;hpb=306d2f61a1b64179e801fa8a0bb2bd7b4e9dd682;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/magnifier/magnifier-impl.h b/dali-toolkit/internal/controls/magnifier/magnifier-impl.h
index 4def324..7cf6940 100644
--- a/dali-toolkit/internal/controls/magnifier/magnifier-impl.h
+++ b/dali-toolkit/internal/controls/magnifier/magnifier-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_MAGNIFIER_H__
-#define __DALI_TOOLKIT_INTERNAL_MAGNIFIER_H__
+#ifndef DALI_TOOLKIT_INTERNAL_MAGNIFIER_H
+#define DALI_TOOLKIT_INTERNAL_MAGNIFIER_H
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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.
@@ -22,24 +22,20 @@
 #include <dali/public-api/actors/camera-actor.h>
 #include <dali/public-api/actors/layer.h>
 #include <dali/public-api/render-tasks/render-task.h>
-#include <dali/public-api/actors/image-actor.h>
 
 // INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/controls/magnifier/magnifier.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/public-api/controls/magnifier/magnifier.h>
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 namespace Internal
 {
-
 class Magnifier;
 
-typedef IntrusivePtr<Magnifier>    MagnifierPtr;
+typedef IntrusivePtr<Magnifier> MagnifierPtr;
 
 /**
  * @copydoc Toolkit::Magnifier
@@ -47,7 +43,6 @@ typedef IntrusivePtr<Magnifier>    MagnifierPtr;
 class Magnifier : public Control
 {
 public:
-
   /**
    * Create a new Magnifier.
    * @return A public handle to the newly allocated Magnifier.
@@ -55,34 +50,36 @@ public:
   static Dali::Toolkit::Magnifier New();
 
 public:
-
   /**
    * @copydoc Toolkit::ImageView::SetSourceActor
    */
   void SetSourceActor(Actor actor);
 
   /**
-   * @copydoc Toolkit::ImageView::SetSourcePosition
-   */
-  void SetSourcePosition(const Vector3& position);
-
-  /**
-   * @copydoc Toolkit::ImageView::GetFrameVisibility
+   * Returns whether the frame is visible or not.
+   * @return true if frame is visible, false if not.
    */
   bool GetFrameVisibility() const;
 
   /**
-   * @copydoc Toolkit::ImageView::SetFrameVisibility
+   * Sets whether the frame part of the magnifier should be visible or not.
+   * @param[in] visible true to display frame, false to hide frame.
    */
   void SetFrameVisibility(bool visible);
 
   /**
-   * @copydoc Toolkit::ImageView::GetMagnificationFactor
+   * Get the magnification factor of the magnifier
+   * The larger the value the larger the contents magnified.
+   * A value of 1.0f indications 1x magnification.
+   * @return Magnification factor is returned
    */
   float GetMagnificationFactor() const;
 
   /**
-   * @copydoc Toolkit::ImageView::SetMagnificationFactor
+   * Set the magnification factor of the magnifier
+   * The larger the value the larger the contents magnified.
+   * A value of 1.0f indications 1x magnification.
+   * @param[in] value Magnification factor.
    */
   void SetMagnificationFactor(float value);
 
@@ -91,8 +88,25 @@ public:
    */
   void Update();
 
-protected:
+  // Properties
+
+  /**
+   * Called when a property of an object of this type is set.
+   * @param[in] object The object whose property is set.
+   * @param[in] index The property index.
+   * @param[in] value The new property value.
+   */
+  static void SetProperty(BaseObject* object, Property::Index index, const Property::Value& value);
+
+  /**
+   * Called to retrieve a property of an object of this type.
+   * @param[in] object The object whose property is to be retrieved.
+   * @param[in] index The property index.
+   * @return The current value of the property.
+   */
+  static Property::Value GetProperty(BaseObject* object, Property::Index index);
 
+protected:
   /**
    * Construct a new Magnifier.
    */
@@ -109,18 +123,15 @@ protected:
   virtual ~Magnifier();
 
 private:
-
   /**
    * Initializes the render task required to render contents.
    */
   void InitializeRenderTask();
 
 private:
-
-  virtual void OnControlSizeSet(const Vector3& targetSize);
+  void OnSizeSet(const Vector3& targetSize) override;
 
 private:
-
   // Undefined
   Magnifier(const Magnifier&);
 
@@ -128,15 +139,13 @@ private:
   Magnifier& operator=(const Magnifier& rhs);
 
 private:
-
-  RenderTask mTask;                             ///< Render Task to render the source actor contents.
-  CameraActor mCameraActor;                     ///< CameraActor attached to RenderTask
-  ImageActor mFrame;                            ///< The Magnifier Frame
-  Property::Index mPropertySourcePosition;      ///< Source Position ("source-position")
-  Actor mSourceActor;                           ///< Source Delegate Actor represents the source position to read.
-  float mDefaultCameraDistance;                 ///< Default RenderTask's camera distance from target.
-  Vector3 mActorSize;                           ///< The Actor size
-  float mMagnificationFactor;                   ///< Magnification factor 1.0f is default. same as content.
+  RenderTask  mTask;                  ///< Render Task to render the source actor contents.
+  CameraActor mCameraActor;           ///< CameraActor attached to RenderTask
+  Actor       mFrame;                 ///< The Magnifier Frame
+  Actor       mSourceActor;           ///< Source Delegate Actor represents the source position to read.
+  float       mDefaultCameraDistance; ///< Default RenderTask's camera distance from target.
+  Vector3     mActorSize;             ///< The Actor size
+  float       mMagnificationFactor;   ///< Magnification factor 1.0f is default. same as content.
 };
 
 } // namespace Internal
@@ -165,4 +174,4 @@ inline const Toolkit::Internal::Magnifier& GetImpl(const Toolkit::Magnifier& pub
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_INTERNAL_MAGNIFIER_H__
+#endif // DALI_TOOLKIT_INTERNAL_MAGNIFIER_H