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
[dali_1.3.26] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
image-view
/
image-view-impl.cpp
diff --git
a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
index
9af610b
..
20869d3
100755
(executable)
--- a/
dali-toolkit/internal/controls/image-view/image-view-impl.cpp
+++ b/
dali-toolkit/internal/controls/image-view/image-view-impl.cpp
@@
-286,7
+286,8
@@
void ImageView::OnRelayout( const Vector2& size, RelayoutContainer& container )
// scale to fit the padded area
auto finalSize =
// scale to fit the padded area
auto finalSize =
- naturalSize * std::min((paddedSize.width / naturalSize.width), (paddedSize.height / naturalSize.height));
+ naturalSize * std::min( ( naturalSize.width ? ( paddedSize.width / naturalSize.width ) : 0 ),
+ ( naturalSize.height ? ( paddedSize.height / naturalSize.height ) : 0 ) );
// calculate final offset within the padded area
auto finalOffset = Vector2(padding.start, padding.top) + (paddedSize - finalSize) * .5f;
// calculate final offset within the padded area
auto finalOffset = Vector2(padding.start, padding.top) + (paddedSize - finalSize) * .5f;