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

Merge pull request #7818 from andyque/fixPageViewTouchBeganPositionIssue 

fix pageView touch location
This commit is contained in:
minggo 2014-08-20 10:11:59 +08:00
parent 83ccfa0faa deb7ff64d4
commit 41905cb4c0
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cocos/ui/UIPageView.cpp
View File

@ -533,6 +533,7 @@ void PageView::interceptTouchEvent(TouchEventType event, Widget *sender, Touch *
{
case TouchEventType::BEGAN:
{
_touchBeganPosition = touch->getLocation();
_isInterceptTouch = true;
}
break;
@ -540,6 +541,7 @@ void PageView::interceptTouchEvent(TouchEventType event, Widget *sender, Touch *
{
float offset = 0;
offset = fabs(sender->getTouchBeganPosition().x - touchPoint.x);
_touchMovePosition = touch->getLocation();
if (offset > _childFocusCancelOffset)
{
sender->setHighlighted(false);
@ -550,6 +552,7 @@ void PageView::interceptTouchEvent(TouchEventType event, Widget *sender, Touch *
case TouchEventType::CANCELED:
case TouchEventType::ENDED:
{
_touchEndPosition = touch->getLocation();
handleReleaseLogic(touch);
if (sender->isSwallowTouches())
{

2
cocos/ui/UIScrollView.cpp
View File

@ -1573,10 +1573,10 @@ void ScrollView::interceptTouchEvent(Widget::TouchEventType event, Widget *sende
case TouchEventType::MOVED:
{
float offset = (sender->getTouchBeganPosition() - touchPoint).getLength();
_touchMovePosition = touch->getLocation();
if (offset > _childFocusCancelOffset)
{
sender->setHighlighted(false);
_touchMovePosition = touch->getLocation();
handleMoveLogic(touch);
}
}