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

ScrollView sometimes shows incorrect position in vertical direction. (#532)

This commit is contained in:
榆柳松 2021-11-04 17:08:33 +08:00 committed by GitHub
parent 91820ed458
commit e001ae7194
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cocos/ui/UIScrollView.cpp
View File

@ -167,19 +167,11 @@ void ScrollView::setInnerContainerSize(const Vec2 &size)
float innerSizeWidth = _contentSize.width;
float innerSizeHeight = _contentSize.height;
Vec2 originalInnerSize = _innerContainer->getContentSize();
if (size.width < _contentSize.width)
{
CCLOG("Inner width <= scrollview width, it will be force sized!");
}
else
if (size.width >= innerSizeWidth)
{
innerSizeWidth = size.width;
}
if (size.height < _contentSize.height)
{
CCLOG("Inner height <= scrollview height, it will be force sized!");
}
else
if (size.height >= innerSizeHeight)
{
innerSizeHeight = size.height;
}
@ -213,6 +205,14 @@ void ScrollView::setInnerContainerSize(const Vec2 &size)
pos.y = _contentSize.height - (1.0f - _innerContainer->getAnchorPoint().y) * _innerContainer->getContentSize().height;
}
}
// In the vertical direction, if the _innerContainer initially contains content larger than _contentSize.height,
// this will result in bottom alignment.Obviously this is not what I want,
// so here is the rule : when the height of _innerContainer and _contentSize are equal,
// if the position of _innerContainer needs to be changed at this point,align _innerContainer to the top.
if (Direction::VERTICAL == _direction && originalInnerSize.height == _contentSize.height) {
pos.y = _contentSize.height - innerSizeHeight;
}
setInnerContainerPosition(pos);
updateScrollBar(Vec2::ZERO);