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

issue #3069: Updating ScrollView.

This commit is contained in:
James Chen 2013-10-25 16:06:52 +08:00
parent 312e1bd27c
commit 262b54eef2
2 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
extensions/GUI/CCScrollView/CCScrollView.cpp
View File

@ -56,6 +56,7 @@ ScrollView::ScrollView()
, _touchLength(0.0f)
, _minScale(0.0f)
, _maxScale(0.0f)
, _touchListener(nullptr)
{
}
@ -109,14 +110,7 @@ bool ScrollView::initWithViewSize(Size size, Node *container/* = NULL*/)
this->setViewSize(size);
auto dispatcher = EventDispatcher::getInstance();
auto listener = EventListenerTouchOneByOne::create();
listener->onTouchBegan = CC_CALLBACK_2(ScrollView::onTouchBegan, this);
listener->onTouchMoved = CC_CALLBACK_2(ScrollView::onTouchMoved, this);
listener->onTouchEnded = CC_CALLBACK_2(ScrollView::onTouchEnded, this);
listener->onTouchCancelled = CC_CALLBACK_2(ScrollView::onTouchCancelled, this);
dispatcher->addEventListenerWithSceneGraphPriority(listener, this);
setTouchEnabled(true);
_touches.reserve(EventTouch::MAX_TOUCHES);
@ -183,16 +177,29 @@ void ScrollView::resume(Object* sender)
_container->resumeSchedulerAndActions();
}
//void ScrollView::setTouchEnabled(bool e)
//{
// Layer::setTouchEnabled(e);
// if (!e)
// {
// _dragging = false;
// _touchMoved = false;
// _touches.clear();
// }
//}
void ScrollView::setTouchEnabled(bool enabled)
{
auto dispatcher = EventDispatcher::getInstance();
dispatcher->removeEventListener(_touchListener);
if (enabled)
{
_touchListener = EventListenerTouchOneByOne::create();
_touchListener->onTouchBegan = CC_CALLBACK_2(ScrollView::onTouchBegan, this);
_touchListener->onTouchMoved = CC_CALLBACK_2(ScrollView::onTouchMoved, this);
_touchListener->onTouchEnded = CC_CALLBACK_2(ScrollView::onTouchEnded, this);
_touchListener->onTouchCancelled = CC_CALLBACK_2(ScrollView::onTouchCancelled, this);
dispatcher->addEventListenerWithSceneGraphPriority(_touchListener, this);
}
else
{
_dragging = false;
_touchMoved = false;
_touches.clear();
}
}
void ScrollView::setContentOffset(Point offset, bool animated/* = false*/)
{

5
extensions/GUI/CCScrollView/CCScrollView.h
View File

@ -166,7 +166,7 @@ public:
*/
void resume(Object* sender);
void setTouchEnabled(bool enabled);
bool isDragging() const {return _dragging;}
bool isTouchMoved() const { return _touchMoved; }
bool isBounceable() const { return _bounceable; }
@ -347,6 +347,9 @@ protected:
*/
Rect _parentScissorRect;
bool _scissorRestored;
/** Touch listener */
EventListenerTouchOneByOne* _touchListener;
};
// end of GUI group