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

fix typo

This commit is contained in:
andyque 2014-08-14 14:36:30 +08:00
parent 18851d3e81
commit e27a2aee91
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cocos/ui/UIPageView.cpp
View File

@ -46,7 +46,7 @@ _pageViewEventListener(nullptr),
_pageViewEventSelector(nullptr), _pageViewEventSelector(nullptr),
_eventCallback(nullptr), _eventCallback(nullptr),
_customScrollThreshold(0.0), _customScrollThreshold(0.0),
_usingCustomCrollThreshold(false) _usingCustomScrollThreshold(false)
{ {
this->setTouchEnabled(true); this->setTouchEnabled(true);
} }
@ -464,12 +464,12 @@ float PageView::getCustomScrollThreshold()const
void PageView::setUsingCustomScrollThreshold(bool flag) void PageView::setUsingCustomScrollThreshold(bool flag)
{ {
_usingCustomCrollThreshold = flag; _usingCustomScrollThreshold = flag;
} }
bool PageView::isUsingCustomScrollThreshold()const bool PageView::isUsingCustomScrollThreshold()const
{ {
return _usingCustomCrollThreshold; return _usingCustomScrollThreshold;
} }
void PageView::handleReleaseLogic(Touch *touch) void PageView::handleReleaseLogic(Touch *touch)
@ -485,7 +485,7 @@ void PageView::handleReleaseLogic(Touch *touch)
ssize_t pageCount = this->getPageCount(); ssize_t pageCount = this->getPageCount();
float curPageLocation = curPagePos.x; float curPageLocation = curPagePos.x;
float pageWidth = getContentSize().width; float pageWidth = getContentSize().width;
if (!_usingCustomCrollThreshold) { if (!_usingCustomScrollThreshold) {
_customScrollThreshold = pageWidth / 2.0; _customScrollThreshold = pageWidth / 2.0;
} }
float boundary = _customScrollThreshold; float boundary = _customScrollThreshold;

2
cocos/ui/UIPageView.h
View File

@ -237,7 +237,7 @@ protected:
float _leftBoundary; float _leftBoundary;
float _rightBoundary; float _rightBoundary;
float _customScrollThreshold; float _customScrollThreshold;
bool _usingCustomCrollThreshold; bool _usingCustomScrollThreshold;
float _childFocusCancelOffset; float _childFocusCancelOffset;