X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fimage-view%2Fimage-view-impl.h;h=75d5c49f1758bf0d5d3b6cd4afd026d011a1a7e1;hb=0dff3c4148500946802549bbf52fcd0a29c4b903;hp=df0e66b1051425e9c96725db779ce38ed64bfb2d;hpb=4b2d9509f960d8e713603afd4491ef69556589c4;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 df0e66b..75d5c49 100644 --- a/dali-toolkit/internal/controls/image-view/image-view-impl.h +++ b/dali-toolkit/internal/controls/image-view/image-view-impl.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_INTERNAL_IMAGE_VIEW_H__ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 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. @@ -68,7 +68,7 @@ public: * If the handle is empty, ImageView will display nothing * @param[in] map The Dali::Property::Map to use for to display. */ - void SetImage( Dali::Property::Map map ); + void SetImage( const Dali::Property::Map& map ); /** * @copydoc Dali::Toolkit::SetImage @@ -123,6 +123,16 @@ public: private: // From Control /** + * @copydoc Toolkit::Control::OnInitialize + */ + void OnInitialize(); + + /** + * @copydoc CustomActorImpl::OnStageConnection() + */ + virtual void OnStageConnection( int depth ); + + /** * @copydoc Toolkit::Control::GetNaturalSize */ virtual Vector3 GetNaturalSize(); @@ -143,13 +153,20 @@ private: // From Control virtual void OnRelayout( const Vector2& size, RelayoutContainer& container ); private: + + /** + * @brief Callback for ResourceReadySignal + * param[in] control signal prototype + */ + void OnResourceReady( Toolkit::Control control ); + +private: // Undefined ImageView( const ImageView& ); ImageView& operator=( const ImageView& ); private: Toolkit::Visual::Base mVisual; - ImageDimensions mImageSize; 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