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

Merge branch 'gles20-ccbi' of https://github.com/nicolasgramlich/cocos2d-x into gles20-ccbi 

Conflicts:
	cocos2dx/extensions/CCScrollView/CCScrollView.h
This commit is contained in:
James Chen 2012-06-19 10:51:40 +08:00
parent 9fa74721a7 ac4a56a38c
commit da85a36cd1
3 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos2dx/extensions/CCBReader/CCScrollViewLoader.cpp
View File

@ -21,7 +21,7 @@ void CCScrollViewLoader::onHandlePropTypeCheck(CCNode * pNode, CCNode * pParent,
void CCScrollViewLoader::onHandlePropTypeCCBFile(CCNode * pNode, CCNode * pParent, CCString * pPropertyName, CCNode * pCCBFileNode, CCBReader * pCCBReader) { void CCScrollViewLoader::onHandlePropTypeCCBFile(CCNode * pNode, CCNode * pParent, CCString * pPropertyName, CCNode * pCCBFileNode, CCBReader * pCCBReader) {
if(pPropertyName->compare(PROPERTY_CONTAINER) == 0) { if(pPropertyName->compare(PROPERTY_CONTAINER) == 0) {
((CCScrollView *)pNode)->addChild(pCCBFileNode); ((CCScrollView *)pNode)->setContainer(pCCBFileNode);
} else { } else {
CCNodeLoader::onHandlePropTypeCCBFile(pNode, pParent, pPropertyName, pCCBFileNode, pCCBReader); CCNodeLoader::onHandlePropTypeCCBFile(pNode, pParent, pPropertyName, pCCBFileNode, pCCBReader);
} }

45
cocos2dx/extensions/CCScrollView/CCScrollView.cpp
View File

@ -127,7 +127,7 @@ bool CCScrollView::initWithViewSize(CCSize size, CCNode *container/* = NULL*/)
m_pDelegate = NULL; m_pDelegate = NULL;
m_bBounceable = true; m_bBounceable = true;
m_bClippingToBounds = true; m_bClippingToBounds = true;
m_pContainer->setContentSize(CCSizeZero); //m_pContainer->setContentSize(CCSizeZero);
m_eDirection = CCScrollViewDirectionBoth; m_eDirection = CCScrollViewDirectionBoth;
m_pContainer->setPosition(ccp(0.0f, 0.0f)); m_pContainer->setPosition(ccp(0.0f, 0.0f));
m_fTouchLength = 0.0f; m_fTouchLength = 0.0f;
@ -308,9 +308,10 @@ void CCScrollView::setZoomScaleInDuration(float s, float dt)
void CCScrollView::setViewSize(CCSize size) void CCScrollView::setViewSize(CCSize size)
{ {
if (!CCSize::CCSizeEqualToSize(m_tViewSize, size)) m_tViewSize = size;
if (this->m_pContainer != NULL)
{ {
m_tViewSize = size;
m_fMaxInset = this->maxContainerOffset(); m_fMaxInset = this->maxContainerOffset();
m_fMaxInset = ccp(m_fMaxInset.x + m_tViewSize.width * INSET_RATIO, m_fMaxInset = ccp(m_fMaxInset.x + m_tViewSize.width * INSET_RATIO,
m_fMaxInset.y + m_tViewSize.height * INSET_RATIO); m_fMaxInset.y + m_tViewSize.height * INSET_RATIO);
@ -318,6 +319,29 @@ void CCScrollView::setViewSize(CCSize size)
m_fMinInset = ccp(m_fMinInset.x - m_tViewSize.width * INSET_RATIO, m_fMinInset = ccp(m_fMinInset.x - m_tViewSize.width * INSET_RATIO,
m_fMinInset.y - m_tViewSize.height * INSET_RATIO); m_fMinInset.y - m_tViewSize.height * INSET_RATIO);
} }
CCLayer::setContentSize(size);
}
CCNode * CCScrollView::getContainer()
{
return this->m_pContainer;
}
void CCScrollView::setContainer(CCNode * pContainer)
{
this->removeAllChildrenWithCleanup(true);
if (!pContainer) return;
this->m_pContainer = pContainer;
this->m_pContainer->ignoreAnchorPointForPosition(false);
this->m_pContainer->setAnchorPoint(ccp(0.0f, 0.0f));
this->addChild(this->m_pContainer);
this->setViewSize(this->m_tViewSize);
} }
void CCScrollView::relocateContainer(bool animated) void CCScrollView::relocateContainer(bool animated)
@ -432,23 +456,11 @@ CCSize CCScrollView::getContentSize()
void CCScrollView::setContentSize(CCSize size) void CCScrollView::setContentSize(CCSize size)
{ {
// this->setViewSize(size); this->setViewSize(size);
if (m_pContainer != NULL)
{
m_pContainer->setContentSize(size);
m_fMaxInset = this->maxContainerOffset();
m_fMaxInset = ccp(m_fMaxInset.x + m_tViewSize.width * INSET_RATIO,
m_fMaxInset.y + m_tViewSize.height * INSET_RATIO);
m_fMinInset = this->minContainerOffset();
m_fMinInset = ccp(m_fMinInset.x - m_tViewSize.width * INSET_RATIO,
m_fMinInset.y - m_tViewSize.height * INSET_RATIO);
}
} }
/** /**
* make sure all children go to the container * make sure all children go to the container
*/ */
void CCScrollView::addChild(CCNode * child, int zOrder, int tag) void CCScrollView::addChild(CCNode * child, int zOrder, int tag)
{ {
child->ignoreAnchorPointForPosition(false); child->ignoreAnchorPointForPosition(false);
@ -473,7 +485,6 @@ void CCScrollView::addChild(CCNode * child)
/** /**
* clip this view so that outside of the visible bounds can be hidden. * clip this view so that outside of the visible bounds can be hidden.
*/ */
void CCScrollView::beforeDraw() void CCScrollView::beforeDraw()
{ {
if (m_bClippingToBounds) if (m_bClippingToBounds)

8
cocos2dx/extensions/CCScrollView/CCScrollView.h
View File

@ -182,6 +182,8 @@ public:
CCSize getViewSize() { return m_tViewSize; } CCSize getViewSize() { return m_tViewSize; }
void setViewSize(CCSize size); void setViewSize(CCSize size);
CCNode * getContainer();
void setContainer(CCNode * pContainer);
/** /**
* direction allowed to scroll. CCScrollViewDirectionBoth by default. * direction allowed to scroll. CCScrollViewDirectionBoth by default.
*/ */
@ -329,6 +331,12 @@ protected:
* Hence, this scroll view will use a separate size property. * Hence, this scroll view will use a separate size property.
*/ */
CCSize m_tViewSize; CCSize m_tViewSize;
public:
CCSize getViewSize() { return m_tViewSize; }
void setViewSize(CCSize size);
CCNode * getContainer();
void setContainer(CCNode * pContainer);
protected:
/** /**
* max and min scale * max and min scale
*/ */