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
Fix ImageVisual to work Action::RELOAD
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
npatch-loader.h
diff --git
a/dali-toolkit/internal/visuals/npatch-loader.h
b/dali-toolkit/internal/visuals/npatch-loader.h
index
0d9a1c2
..
8c75477
100644
(file)
--- a/
dali-toolkit/internal/visuals/npatch-loader.h
+++ b/
dali-toolkit/internal/visuals/npatch-loader.h
@@
-20,11
+20,8
@@
// EXTERNAL INCLUDES
#include <string>
#include <dali/public-api/rendering/texture-set.h>
// EXTERNAL INCLUDES
#include <string>
#include <dali/public-api/rendering/texture-set.h>
+#include <dali/public-api/math/uint-16-pair.h>
#include <dali/devel-api/common/owner-container.h>
#include <dali/devel-api/common/owner-container.h>
-#include <dali/devel-api/images/nine-patch-image.h>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/devel-api/image-loader/image-atlas.h>
namespace Dali
{
namespace Dali
{
@@
-35,6
+32,13
@@
namespace Toolkit
namespace Internal
{
namespace Internal
{
+namespace NPatchBuffer
+{
+
+void GetRedOffsetAndMask( Dali::Pixel::Format pixelFormat, int& byteOffset, int& bitMask );
+
+} // namespace NPatchBuffer
+
/**
* The manager for loading Npatch textures.
* It caches them internally for better performance; i.e. to avoid loading and
/**
* The manager for loading Npatch textures.
* It caches them internally for better performance; i.e. to avoid loading and
@@
-48,6
+52,8
@@
class NPatchLoader
{
public:
{
public:
+ typedef Dali::Vector< Uint16Pair > StretchRanges;
+
enum
{
UNINITIALIZED_ID = 0 ///< uninitialised id, use to initialize ids
enum
{
UNINITIALIZED_ID = 0 ///< uninitialised id, use to initialize ids
@@
-57,11
+63,12
@@
public:
{
std::string url; ///< Url of the N-Patch
TextureSet textureSet; ///< Texture containing the cropped image
{
std::string url; ///< Url of the N-Patch
TextureSet textureSet; ///< Texture containing the cropped image
-
NinePatchImage::StretchRanges stretchPixelsX;
///< X stretch pixels
-
NinePatchImage::StretchRanges stretchPixelsY;
///< Y stretch pixels
+
StretchRanges stretchPixelsX;
///< X stretch pixels
+
StretchRanges stretchPixelsY;
///< Y stretch pixels
std::size_t hash; ///< Hash code for the Url
uint32_t croppedWidth; ///< Width of the cropped middle part of N-patch
uint32_t croppedHeight; ///< Height of the cropped middle part of N-patch
std::size_t hash; ///< Hash code for the Url
uint32_t croppedWidth; ///< Width of the cropped middle part of N-patch
uint32_t croppedHeight; ///< Height of the cropped middle part of N-patch
+ Rect< int > border; ///< The size of the border
};
public:
};
public:
@@
-80,9
+87,12
@@
public:
* @brief Retrieve a texture matching the n-patch url.
*
* @param [in] url to retrieve
* @brief Retrieve a texture matching the n-patch url.
*
* @param [in] url to retrieve
+ * @param [in] border The border size of the image
+ * @param [in,out] preMultiplyOnLoad True if the image color should be multiplied by it's alpha. Set to false if the
+ * image has no alpha channel
* @return id of the texture.
*/
* @return id of the texture.
*/
- std::size_t Load( const std::string& url );
+ std::size_t Load( const std::string& url
, const Rect< int >& border, bool& preMultiplyOnLoad
);
/**
* @brief Retrieve N patch data matching to an id
/**
* @brief Retrieve N patch data matching to an id