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
Removed dangerous implicit float conversion from LayoutLength and removed some of...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
layouting
/
grid-impl.cpp
diff --git
a/dali-toolkit/internal/layouting/grid-impl.cpp
b/dali-toolkit/internal/layouting/grid-impl.cpp
index
af9b82e
..
3bb54a9
100644
(file)
--- a/
dali-toolkit/internal/layouting/grid-impl.cpp
+++ b/
dali-toolkit/internal/layouting/grid-impl.cpp
@@
-100,8
+100,8
@@
void Grid::OnMeasure( MeasureSpec widthMeasureSpec, MeasureSpec heightMeasureSpe
LayoutLength widthSize = widthMeasureSpec.GetSize();
LayoutLength heightSize = heightMeasureSpec.GetSize();
LayoutLength widthSize = widthMeasureSpec.GetSize();
LayoutLength heightSize = heightMeasureSpec.GetSize();
-
int availableContentWidth(0
);
-
int availableContentHeight(0
);
+
LayoutLength availableContentWidth( 0
);
+
LayoutLength availableContentHeight( 0
);
LayoutLength desiredChildHeight( 0 );
LayoutLength desiredChildWidth( 0 );
LayoutLength desiredChildHeight( 0 );
LayoutLength desiredChildWidth( 0 );
@@
-149,11
+149,11
@@
void Grid::OnMeasure( MeasureSpec widthMeasureSpec, MeasureSpec heightMeasureSpe
mTotalWidth = std::min( mTotalWidth, widthSize );
}
mTotalWidth = std::min( mTotalWidth, widthSize );
}
- availableContentWidth = mTotalWidth - gridLayoutPadding.start - gridLayoutPadding.end;
+ availableContentWidth = mTotalWidth
.mValue
- gridLayoutPadding.start - gridLayoutPadding.end;
widthSize = mTotalWidth;
DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Grid::OnMeasure availableContentWidth(%d) mTotalWidth(%d) \n",
widthSize = mTotalWidth;
DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Grid::OnMeasure availableContentWidth(%d) mTotalWidth(%d) \n",
- availableContentWidth,
+ availableContentWidth
.mValue
,
mTotalWidth.mValue );
// HEIGHT SPECIFICATIONS
mTotalWidth.mValue );
// HEIGHT SPECIFICATIONS
@@
-196,10
+196,10
@@
void Grid::OnMeasure( MeasureSpec widthMeasureSpec, MeasureSpec heightMeasureSpe
}
// If number of columns not defined
}
// If number of columns not defined
- DetermineNumberOfColumns( availableContentWidth );
+ DetermineNumberOfColumns( availableContentWidth
.mValue
);
// Locations define the start, end,top and bottom of each cell.
// Locations define the start, end,top and bottom of each cell.
- mLocations->CalculateLocations( mNumColumns, availableContentWidth
, availableContentHeight
, childCount, 0, 0 );
+ mLocations->CalculateLocations( mNumColumns, availableContentWidth
.mValue, availableContentHeight.mValue
, childCount, 0, 0 );
SetMeasuredDimensions( ResolveSizeAndState( widthSize, widthMeasureSpec, MeasuredSize::State::MEASURED_SIZE_OK ),
SetMeasuredDimensions( ResolveSizeAndState( widthSize, widthMeasureSpec, MeasuredSize::State::MEASURED_SIZE_OK ),