X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fimage-view%2Fimage-view-impl.h;h=32867bf304424ce2bfc2030587e15bae005387cf;hp=df0e66b1051425e9c96725db779ce38ed64bfb2d;hb=59314022f6789147a47a8b098433e211b6185625;hpb=f8b44eeacea1fc7c96d84eb3754d7b4a4884b49f 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..32867bf 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,11 @@ public: private: // From Control /** + * @copydoc Toolkit::Control::OnInitialize + */ + void OnInitialize(); + + /** * @copydoc Toolkit::Control::GetNaturalSize */ virtual Vector3 GetNaturalSize(); @@ -143,13 +148,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