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 possible error if negative grid columns set
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
layouting
/
grid-locations.cpp
diff --git
a/dali-toolkit/internal/layouting/grid-locations.cpp
b/dali-toolkit/internal/layouting/grid-locations.cpp
index
8cb1cca
..
a4d3060
100644
(file)
--- a/
dali-toolkit/internal/layouting/grid-locations.cpp
+++ b/
dali-toolkit/internal/layouting/grid-locations.cpp
@@
-59,6
+59,8
@@
void GridLocations::CalculateLocations( int numberOfColumns,
unsigned int columnWidth,
unsigned int rowHeight )
{
unsigned int columnWidth,
unsigned int rowHeight )
{
+ DALI_ASSERT_DEBUG( numberOfColumns > 0 && "number of columns should be greater than 0" );
+ numberOfColumns = std::max ( numberOfColumns, 1 );
mLocations.clear();
// Calculate width and height of columns and rows.
mLocations.clear();
// Calculate width and height of columns and rows.