Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13673 from Almax27/patch-3 

Removed ScrollView::_innerContainer pointer copy
This commit is contained in:
子龙山人 2015-09-15 17:42:20 +08:00
parent 6eece55e80 59fab25804
commit f5848290a2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/ui/UIScrollView.cpp
View File

@ -1401,8 +1401,8 @@ void ScrollView::copySpecialProperties(Widget *widget)
if (scrollView)
{
Layout::copySpecialProperties(widget);
_innerContainer = scrollView->_innerContainer;
setDirection(scrollView->_direction);
setInnerContainerPosition(scrollView->getInnerContainerPosition());
setInnerContainerSize(scrollView->getInnerContainerSize());
_topBoundary = scrollView->_topBoundary;
_bottomBoundary = scrollView->_bottomBoundary;