-#ifndef __DALI_TOOLKIT_INTERNAL_IMAGE_VIEW_H__
-#define __DALI_TOOLKIT_INTERNAL_IMAGE_VIEW_H__
+#ifndef DALI_TOOLKIT_INTERNAL_IMAGE_VIEW_H
+#define DALI_TOOLKIT_INTERNAL_IMAGE_VIEW_H
/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
#include <dali/public-api/object/property-map.h>
// INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/renderers/image/image-visual.h>
+#include <dali-toolkit/internal/visuals/image/image-visual.h>
#include <dali-toolkit/public-api/controls/control-impl.h>
#include <dali-toolkit/public-api/controls/image-view/image-view.h>
* 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
/**
* @brief Query whether alpha is pre-multiplied.
*
- * @return True is alpha is pre-multiplied, false otherwise.
+ * @return True if alpha is pre-multiplied, false otherwise.
*/
bool IsPreMultipliedAlphaEnabled() const;
/**
* @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
*/
private: // From Control
/**
- * @copydoc Toolkit::Control::OnStageConnect()
+ * @copydoc Toolkit::Control::OnInitialize
*/
- virtual void OnStageConnection( int depth );
-
- /**
- * @copydoc Toolkit::Control::OnStageDisconnection()
- */
- virtual void OnStageDisconnection();
-
- /**
- * @copydoc Toolkit::Control::OnSizeSet()
- */
- virtual void OnSizeSet( const Vector3& targetSize );
+ void OnInitialize();
/**
* @copydoc Toolkit::Control::GetNaturalSize
*/
virtual float GetWidthForHeight( float height );
+ /**
+ * @copydoc Toolkit::Control::OnRelayout()
+ */
+ 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 mRenderer;
- ImageDimensions mImageSize;
- Vector2 mSizeSet;
+ 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
+
+ bool mImageVisualPaddingSetByTransform :1; //< Flag to indicate Padding was set using a transform.
};
} // namespace Internal
} // namespace Dali
-#endif // __DALI_TOOLKIT_INTERNAL_IMAGE_VIEW_H__
+#endif // DALI_TOOLKIT_INTERNAL_IMAGE_VIEW_H