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

Merge pull request #7285 from andyque/fixScrollChildren 

fix scroll
This commit is contained in:
minggo 2014-07-02 11:55:48 +08:00
parent 77762cd8b9 6e64714331
commit c4423d6848
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos/ui/UIScrollView.cpp
View File

@ -852,7 +852,7 @@ bool ScrollView::checkCustomScrollDestination(float* touchOffsetX, float* touchO
bool ScrollView::scrollChildrenVertical(float touchOffsetX, float touchOffsetY)
{
float realOffset = touchOffsetY;
bool scrollEnabled = false;
bool scrollEnabled = true;
if (_bounceEnabled)
{
float icBottomPos = _innerContainer->getBottomBoundary();
@ -894,7 +894,7 @@ bool ScrollView::scrollChildrenVertical(float touchOffsetX, float touchOffsetY)
bool ScrollView::scrollChildrenHorizontal(float touchOffsetX, float touchOffestY)
{
bool scrollenabled = false;
bool scrollenabled = true;
float realOffset = touchOffsetX;
if (_bounceEnabled)
{
@ -936,7 +936,7 @@ bool ScrollView::scrollChildrenHorizontal(float touchOffsetX, float touchOffestY
bool ScrollView::scrollChildrenBoth(float touchOffsetX, float touchOffsetY)
{
bool scrollenabled = false;
bool scrollenabled = true;
float realOffsetX = touchOffsetX;
float realOffsetY = touchOffsetY;
if (_bounceEnabled)