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

Merge pull request #5058 from zhiqiangxu/develop 

ScrollView should implement ActionTweenDelegate
This commit is contained in:
James Chen 2014-02-20 20:33:04 +08:00
parent 4016d9074f 3a86ec1ead
commit e59a14f205
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -310,6 +310,11 @@ void ScrollView::setZoomScaleInDuration(float s, float dt)
} }
} }
void ScrollView::updateTweenAction(float value, const std::string& key)
{
this->setZoomScale(value);
}
void ScrollView::setViewSize(Size size) void ScrollView::setViewSize(Size size)
{ {
_viewSize = size; _viewSize = size;

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

@ -65,7 +65,7 @@ public:
* ScrollView support for cocos2d-x. * ScrollView support for cocos2d-x.
* It provides scroll view functionalities to cocos2d projects natively. * It provides scroll view functionalities to cocos2d projects natively.
*/ */
class ScrollView : public Layer class ScrollView : public Layer, public ActionTweenDelegate
{ {
public: public:
enum class Direction enum class Direction
@ -230,6 +230,10 @@ public:
using Node::addChild; using Node::addChild;
virtual void addChild(Node * child, int zOrder, int tag) override; virtual void addChild(Node * child, int zOrder, int tag) override;
/**
* CCActionTweenDelegate
*/
void updateTweenAction(float value, const std::string& key);
protected: protected:
/** /**
* Relocates the container at the proper offset, in bounds of max/min offsets. * Relocates the container at the proper offset, in bounds of max/min offsets.