X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fimage-view%2Fimage-view-impl.h;h=90dc192457181ac8e213502552ae96293188dc09;hb=ca0345e4749910cccbb912fe85917ecb5c469003;hp=382feb8734f25185e6877c96411bebf1b87fa568;hpb=7cfada64ad44d4a47785d49993b298f1c2dbd4a0;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 382feb8..90dc192 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) 2019 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. @@ -28,10 +28,8 @@ namespace Dali { - namespace Toolkit { - class ImageView; namespace Internal @@ -39,7 +37,6 @@ namespace Internal class ImageView : public Control { protected: - /** * Construct a new ImageView. */ @@ -58,34 +55,24 @@ public: static Toolkit::ImageView New(); /** - * @copydoc Dali::Toolkit::SetImage - */ - void SetImage( Image image ); - - /** * @brief Sets this ImageView from an Dali::Property::Map * * If the handle is empty, ImageView will display nothing * @param[in] map The Dali::Property::Map to use for to display. */ - void SetImage( const Dali::Property::Map& map ); + void SetImage(const Dali::Property::Map& map); /** * @copydoc Dali::Toolkit::SetImage */ - void SetImage( const std::string& imageUrl, ImageDimensions size ); - - /** - * @copydoc Dali::Toolkit::GetImage - */ - Image GetImage() const; + void SetImage(const std::string& imageUrl, ImageDimensions size); /** * @brief Set whether the Pre-multiplied Alpha Blending is required * * @param[in] preMultipled whether alpha is pre-multiplied. */ - void EnablePreMultipliedAlpha( bool preMultipled ); + void EnablePreMultipliedAlpha(bool preMultipled); /** * @brief Query whether alpha is pre-multiplied. @@ -101,7 +88,7 @@ public: * @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 ); + static void SetProperty(BaseObject* object, Property::Index index, const Property::Value& value); /** * Called to retrieve a property of an object of this type. @@ -109,7 +96,7 @@ public: * @param[in] index The property index. * @return The current value of the property. */ - static Property::Value GetProperty( BaseObject* object, Property::Index propertyIndex ); + static Property::Value GetProperty(BaseObject* object, Property::Index propertyIndex); /** * @brief Set the depth index of this image renderer @@ -118,10 +105,9 @@ public: * * @param[in] depthIndex The depth index of this renderer */ - void SetDepthIndex( int depthIndex ); + void SetDepthIndex(int depthIndex); private: // From Control - /** * @copydoc Toolkit::Control::OnInitialize */ @@ -130,30 +116,29 @@ private: // From Control /** * @copydoc Toolkit::Control::GetNaturalSize */ - virtual Vector3 GetNaturalSize(); + Vector3 GetNaturalSize() override; /** * @copydoc Toolkit::Control::GetHeightForWidth() */ - virtual float GetHeightForWidth( float width ); + float GetHeightForWidth(float width) override; /** * @copydoc Toolkit::Control::GetWidthForHeight() */ - virtual float GetWidthForHeight( float height ); + float GetWidthForHeight(float height) override; /** * @copydoc Toolkit::Control::OnRelayout() */ - virtual void OnRelayout( const Vector2& size, RelayoutContainer& container ); + void OnRelayout(const Vector2& size, RelayoutContainer& container) override; private: - /** * @brief Callback for ResourceReadySignal * param[in] control signal prototype */ - void OnResourceReady( Toolkit::Control control ); + void OnResourceReady(Toolkit::Control control); /** * @brief Set TransformMap for fittingMode @@ -163,7 +148,7 @@ private: * param[in] fittingMode The mode for fitting image * param[in] transformMap The map for fitting image */ - void SetTransformMapForFittingMode ( Vector2 finalSize, Vector2 textureSize, Vector2 offset, Visual::FittingMode fittingMode, Property::Map& transformMap ); + void SetTransformMapForFittingMode(Vector2 finalSize, Vector2 textureSize, Vector2 offset, Visual::FittingMode fittingMode, Property::Map& transformMap); /** * @brief Apply fittingMode @@ -173,37 +158,36 @@ private: * param[in] zeroPadding whether padding is zero * param[in] transformMap The map for fitting image */ - void ApplyFittingMode( Vector2 finalSize, Vector2 textureSize, Vector2 offset, bool zeroPadding , Property::Map& transformMap); + void ApplyFittingMode(Vector2 finalSize, Vector2 textureSize, Vector2 offset, bool zeroPadding, Property::Map& transformMap); private: // Undefined - ImageView( const ImageView& ); - ImageView& operator=( const ImageView& ); + ImageView(const ImageView&); + ImageView& operator=(const ImageView&); private: - Toolkit::Visual::Base mVisual; + Toolkit::Visual::Base mVisual; - 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 - Property::Map mShaderMap; ///< the Property::Map if the custom shader is set, empty otherwise - ImageDimensions mImageSize; ///< the image size + std::string mUrl; ///< the url for the image if the image came from a URL, empty otherwise + Property::Map mPropertyMap; ///< the Property::Map if the image came from a Property::Map, empty otherwise + Property::Map mShaderMap; ///< the Property::Map if the custom shader is set, empty otherwise + ImageDimensions mImageSize; ///< the image size - bool mImageVisualPaddingSetByTransform :1; //< Flag to indicate Padding was set using a transform. - bool mImageViewPixelAreaSetByFittingMode:1; //< Flag to indicate pixel area was set by fitting Mode + bool mImageVisualPaddingSetByTransform : 1; //< Flag to indicate Padding was set using a transform. + bool mImageViewPixelAreaSetByFittingMode : 1; //< Flag to indicate pixel area was set by fitting Mode }; } // namespace Internal // Helpers for public-api forwarding methods -inline Toolkit::Internal::ImageView& GetImpl( Toolkit::ImageView& obj ) +inline Toolkit::Internal::ImageView& GetImpl(Toolkit::ImageView& obj) { DALI_ASSERT_ALWAYS(obj); Dali::RefObject& handle = obj.GetImplementation(); return static_cast(handle); } -inline const Toolkit::Internal::ImageView& GetImpl( const Toolkit::ImageView& obj ) +inline const Toolkit::Internal::ImageView& GetImpl(const Toolkit::ImageView& obj) { DALI_ASSERT_ALWAYS(obj); const Dali::RefObject& handle = obj.GetImplementation();