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
Merge "Add ENABLE_SHIFT_SELECTION property" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
npatch-loader.cpp
diff --git
a/dali-toolkit/internal/visuals/npatch-loader.cpp
b/dali-toolkit/internal/visuals/npatch-loader.cpp
index
f23f1ca
..
8bc050f
100644
(file)
--- a/
dali-toolkit/internal/visuals/npatch-loader.cpp
+++ b/
dali-toolkit/internal/visuals/npatch-loader.cpp
@@
-79,10
+79,10
@@
std::size_t NPatchLoader::Load( const std::string& url, const Rect< int >& borde
data->textureSet = mCache[ cachedIndex ]->textureSet;
NinePatchImage::StretchRanges stretchRangesX;
data->textureSet = mCache[ cachedIndex ]->textureSet;
NinePatchImage::StretchRanges stretchRangesX;
- stretchRangesX.PushBack( Uint16Pair( border.left,
data->croppedWidth - border.right
) );
+ stretchRangesX.PushBack( Uint16Pair( border.left,
( (data->croppedWidth >= static_cast< unsigned int >( border.right )) ? data->croppedWidth - border.right : 0 )
) );
NinePatchImage::StretchRanges stretchRangesY;
NinePatchImage::StretchRanges stretchRangesY;
- stretchRangesY.PushBack( Uint16Pair( border.top,
data->croppedHeight - border.bottom
) );
+ stretchRangesY.PushBack( Uint16Pair( border.top,
( (data->croppedHeight >= static_cast< unsigned int >( border.bottom )) ? data->croppedHeight - border.bottom : 0 )
) );
data->stretchPixelsX = stretchRangesX;
data->stretchPixelsY = stretchRangesY;
data->stretchPixelsX = stretchRangesX;
data->stretchPixelsY = stretchRangesY;
@@
-137,10
+137,10
@@
std::size_t NPatchLoader::Load( const std::string& url, const Rect< int >& borde
data->textureSet.SetTexture( 0u, texture );
NinePatchImage::StretchRanges stretchRangesX;
data->textureSet.SetTexture( 0u, texture );
NinePatchImage::StretchRanges stretchRangesX;
- stretchRangesX.PushBack( Uint16Pair( border.left,
data->croppedWidth - border.right
) );
+ stretchRangesX.PushBack( Uint16Pair( border.left,
( (data->croppedWidth >= static_cast< unsigned int >( border.right )) ? data->croppedWidth - border.right : 0 )
) );
NinePatchImage::StretchRanges stretchRangesY;
NinePatchImage::StretchRanges stretchRangesY;
- stretchRangesY.PushBack( Uint16Pair( border.top,
data->croppedHeight - border.bottom
) );
+ stretchRangesY.PushBack( Uint16Pair( border.top,
( (data->croppedHeight >= static_cast< unsigned int >( border.bottom )) ? data->croppedHeight - border.bottom : 0 )
) );
data->stretchPixelsX = stretchRangesX;
data->stretchPixelsY = stretchRangesY;
data->stretchPixelsX = stretchRangesX;
data->stretchPixelsY = stretchRangesY;