X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fimage-view%2Fimage-view-impl.h;h=f4f38b619b6c52a076a82c96ecdbca40db73d74f;hb=f52e1560139d8b38f846be2125b0125a726ed979;hp=150fbd538149e27029a5766d6e24a31a1859e2aa;hpb=4d4724513d345467aad5d6ff0ff103b191c32a3f;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/image-view/image-view-impl.h b/dali-toolkit/internal/controls/image-view/image-view-impl.h index 150fbd5..f4f38b6 100644 --- a/dali-toolkit/internal/controls/image-view/image-view-impl.h +++ b/dali-toolkit/internal/controls/image-view/image-view-impl.h @@ -22,7 +22,7 @@ #include // INTERNAL INCLUDES -#include +#include #include #include @@ -114,7 +114,7 @@ public: /** * @brief Set the depth index of this image renderer * - * Renderer with higher depth indices are rendered in front of other renderers with smaller values + * Renderer with higher depth indices are rendered in front of other visuals with smaller values * * @param[in] depthIndex The depth index of this renderer */ @@ -123,16 +123,6 @@ public: private: // From Control /** - * @copydoc Toolkit::Control::OnStageConnect() - */ - virtual void OnStageConnection( int depth ); - - /** - * @copydoc Toolkit::Control::OnStageDisconnection() - */ - virtual void OnStageDisconnection(); - - /** * @copydoc Toolkit::Control::OnSizeSet() */ virtual void OnSizeSet( const Vector3& targetSize ); @@ -158,9 +148,9 @@ private: ImageView& operator=( const ImageView& ); private: - Toolkit::ControlRenderer mRenderer; - ImageDimensions mImageSize; - Vector2 mSizeSet; + Toolkit::Visual::Base mVisual; + ImageDimensions mImageSize; + Vector2 mSizeSet; std::string mUrl; ///< the url for the image if the image came from a URL, empty otherwise Image mImage; ///< the Image if the image came from a Image, null otherwise