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

update for ui button press event

This commit is contained in:
Liam 2014-10-25 18:00:57 +08:00
parent 92bdfea638
commit f1970e98dd
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cocos/ui/UIButton.cpp
View File

@ -450,8 +450,16 @@ void Button::onPressStateChangedToNormal()
_buttonNormalRenderer->setScale(_normalTextureScaleXInSize, _normalTextureScaleYInSize); _buttonNormalRenderer->setScale(_normalTextureScaleXInSize, _normalTextureScaleYInSize);
_titleRenderer->stopAllActions(); _titleRenderer->stopAllActions();
_titleRenderer->setScaleX(_normalTextureScaleXInSize); if (_unifySize)
_titleRenderer->setScaleY(_normalTextureScaleYInSize); {
_titleRenderer->setScaleX(1.0f);
_titleRenderer->setScaleY(1.0f);
}
else
{
_titleRenderer->setScaleX(_normalTextureScaleXInSize);
_titleRenderer->setScaleY(_normalTextureScaleYInSize);
}
} }
} }
} }
@ -492,8 +500,16 @@ void Button::onPressStateChangedToPressed()
_buttonNormalRenderer->setScale(_normalTextureScaleXInSize +_zoomScale, _normalTextureScaleYInSize + _zoomScale); _buttonNormalRenderer->setScale(_normalTextureScaleXInSize +_zoomScale, _normalTextureScaleYInSize + _zoomScale);
_titleRenderer->stopAllActions(); _titleRenderer->stopAllActions();
_titleRenderer->setScaleX(_normalTextureScaleXInSize + _zoomScale); if (_unifySize)
_titleRenderer->setScaleY(_normalTextureScaleYInSize + _zoomScale); {
_titleRenderer->setScaleX(1.0f + _zoomScale);
_titleRenderer->setScaleY(1.0f + _zoomScale);
}
else
{
_titleRenderer->setScaleX(_normalTextureScaleXInSize + _zoomScale);
_titleRenderer->setScaleY(_normalTextureScaleYInSize + _zoomScale);
}
} }
} }
} }
@ -582,6 +598,10 @@ void Button::adaptRenderers()
Size Button::getVirtualRendererSize() const Size Button::getVirtualRendererSize() const
{ {
if (_unifySize)
{
return this->getNormalSize();
}
Size titleSize = _titleRenderer->getContentSize(); Size titleSize = _titleRenderer->getContentSize();
if (!_normalTextureLoaded && _titleRenderer->getString().size() > 0) { if (!_normalTextureLoaded && _titleRenderer->getString().size() > 0) {
return titleSize; return titleSize;
@ -839,7 +859,7 @@ void Button::copySpecialProperties(Widget *widget)
} }
} }
Size Button::getNormalSize() Size Button::getNormalSize() const
{ {
Size titleSize; Size titleSize;
if (_titleRenderer != nullptr) if (_titleRenderer != nullptr)

2
cocos/ui/UIButton.h
View File

@ -234,7 +234,7 @@ protected:
virtual Widget* createCloneInstance() override; virtual Widget* createCloneInstance() override;
virtual void copySpecialProperties(Widget* model) override; virtual void copySpecialProperties(Widget* model) override;
virtual Size getNormalSize(); virtual Size getNormalSize() const;
protected: protected:
Scale9Sprite* _buttonNormalRenderer; Scale9Sprite* _buttonNormalRenderer;
Scale9Sprite* _buttonClickedRenderer; Scale9Sprite* _buttonClickedRenderer;