projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove/Move experimental features
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
npatch
/
npatch-visual.h
diff --git
a/dali-toolkit/internal/visuals/npatch/npatch-visual.h
b/dali-toolkit/internal/visuals/npatch/npatch-visual.h
index
7f74022
..
e6c4872
100644
(file)
--- a/
dali-toolkit/internal/visuals/npatch/npatch-visual.h
+++ b/
dali-toolkit/internal/visuals/npatch/npatch-visual.h
@@
-19,12
+19,12
@@
*/
// INTERNAL INCLUDES
*/
// INTERNAL INCLUDES
-#include <dali-toolkit/internal/visuals/visual-impl.h>
+#include <dali-toolkit/internal/visuals/visual-
base-
impl.h>
// EXTERNAL INCLUDES
#include <dali/public-api/images/image.h>
#include <dali/public-api/images/image-operations.h>
// EXTERNAL INCLUDES
#include <dali/public-api/images/image.h>
#include <dali/public-api/images/image-operations.h>
-#include <dali/
public
-api/images/nine-patch-image.h>
+#include <dali/
devel
-api/images/nine-patch-image.h>
#include <dali/public-api/rendering/geometry.h>
#include <dali/public-api/rendering/sampler.h>
#include <dali/public-api/rendering/shader.h>
#include <dali/public-api/rendering/geometry.h>
#include <dali/public-api/rendering/sampler.h>
#include <dali/public-api/rendering/shader.h>
@@
-39,7
+39,7
@@
namespace Internal
{
/**
{
/**
- * The
renderer
which renders an 9 patch image to the control's quad
+ * The
visual
which renders an 9 patch image to the control's quad
*
* The following properties are optional
*
*
* The following properties are optional
*
@@
-49,7
+49,7
@@
namespace Internal
* | borderOnly | BOOLEAN
*
*/
* | borderOnly | BOOLEAN
*
*/
-class NPatchVisual: public Visual
+class NPatchVisual: public Visual
::Base
{
public:
{
public:
@@
-68,47
+68,37
@@
public:
public: // from Visual
/**
public: // from Visual
/**
- * @copydoc Visual::GetNaturalSize
+ * @copydoc Visual::
Base::
GetNaturalSize
*/
virtual void GetNaturalSize( Vector2& naturalSize ) const;
/**
*/
virtual void GetNaturalSize( Vector2& naturalSize ) const;
/**
- * @copydoc Visual::SetClipRect
- */
- virtual void SetClipRect( const Rect<int>& clipRect );
-
- /**
- * @copydoc Visual::SetOffset
- */
- virtual void SetOffset( const Vector2& offset );
-
- /**
- * @copydoc Visual::CreatePropertyMap
+ * @copydoc Visual::Base::CreatePropertyMap
*/
virtual void DoCreatePropertyMap( Property::Map& map ) const;
protected:
/**
*/
virtual void DoCreatePropertyMap( Property::Map& map ) const;
protected:
/**
- * @copydoc Visual::DoInitialize
+ * @copydoc Visual::
Base::
DoInitialize
*/
virtual void DoInitialize( Actor& actor, const Property::Map& propertyMap );
/**
*/
virtual void DoInitialize( Actor& actor, const Property::Map& propertyMap );
/**
- * @copydoc Visual::DoSetOnStage
+ * @copydoc Visual::
Base::
DoSetOnStage
*/
virtual void DoSetOnStage( Actor& actor );
/**
*/
virtual void DoSetOnStage( Actor& actor );
/**
- * @copydoc Visual::DoSetOffStage
+ * @copydoc Visual::
Base::
DoSetOffStage
*/
virtual void DoSetOffStage( Actor& actor );
public:
/**
*/
virtual void DoSetOffStage( Actor& actor );
public:
/**
- * @brief Sets the 9 patch image of this
renderer
to the resource at imageUrl
- * The
renderer
will load the image synchronously when the associated actor is put on stage, and destroy the image when it is off stage
+ * @brief Sets the 9 patch image of this
visual
to the resource at imageUrl
+ * The
visual
will load the image synchronously when the associated actor is put on stage, and destroy the image when it is off stage
*
* @param[in] imageUrl The URL to 9 patch image resource to use
* @param[in] borderOnly A Flag to indicate if the image should omit the centre of the n-patch and only render the border
*
* @param[in] imageUrl The URL to 9 patch image resource to use
* @param[in] borderOnly A Flag to indicate if the image should omit the centre of the n-patch and only render the border
@@
-116,7
+106,7
@@
public:
void SetImage( const std::string& imageUrl, bool borderOnly = false );
/**
void SetImage( const std::string& imageUrl, bool borderOnly = false );
/**
- * @brief Sets the 9 patch image of this
renderer
to the 9 patch image
+ * @brief Sets the 9 patch image of this
viusal
to the 9 patch image
*
* @param[in] image The NinePatchImage to use
* @param[in] borderOnly A Flag to indicate if the image should omit the centre of the n-patch and only render the border
*
* @param[in] image The NinePatchImage to use
* @param[in] borderOnly A Flag to indicate if the image should omit the centre of the n-patch and only render the border
@@
-204,10
+194,10
@@
private:
private:
private:
- NinePatchImage mImage; ///< The image to render if the
renderer
was set from an NinePatchImage, empty otherwise
+ NinePatchImage mImage; ///< The image to render if the
visual
was set from an NinePatchImage, empty otherwise
Image mCroppedImage;
Image mCroppedImage;
- std::string mImageUrl; ///< The url to the image resource to render if the
renderer
was set from an image resource url, empty otherwise
+ std::string mImageUrl; ///< The url to the image resource to render if the
visual
was set from an image resource url, empty otherwise
NinePatchImage::StretchRanges mStretchPixelsX;
NinePatchImage::StretchRanges mStretchPixelsY;
ImageDimensions mImageSize;
NinePatchImage::StretchRanges mStretchPixelsX;
NinePatchImage::StretchRanges mStretchPixelsY;
ImageDimensions mImageSize;