X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fimage-view%2Fimage-view-impl.h;h=669a84f78a09d30aa46c42b3fc0784731964a902;hb=146486a8c7410a2f2a20a6d670145fe855672b96;hp=c598c26759524201331bd28c47ee395a37175962;hpb=f3847b7793b893c9b439e93efeada789ff50f3a8;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 c598c26..669a84f 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 */ @@ -158,14 +158,13 @@ private: ImageView& operator=( const ImageView& ); private: - Toolkit::ControlRenderer mRenderer; - ImageDimensions mImageSize; + 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 Property::Map mPropertyMap; ///< the Property::Map if the image came from a Property::Map, empty otherwise - - bool mPremultipledAlphaEnabled; ///< Flag indicating whether the Pre-multiplied Alpha Blending is required }; } // namespace Internal