mirror of https://github.com/axmolengine/axmol.git
update for ui button press event
This commit is contained in:
parent
92bdfea638
commit
f1970e98dd
|
@ -450,10 +450,18 @@ void Button::onPressStateChangedToNormal()
|
|||
_buttonNormalRenderer->setScale(_normalTextureScaleXInSize, _normalTextureScaleYInSize);
|
||||
|
||||
_titleRenderer->stopAllActions();
|
||||
if (_unifySize)
|
||||
{
|
||||
_titleRenderer->setScaleX(1.0f);
|
||||
_titleRenderer->setScaleY(1.0f);
|
||||
}
|
||||
else
|
||||
{
|
||||
_titleRenderer->setScaleX(_normalTextureScaleXInSize);
|
||||
_titleRenderer->setScaleY(_normalTextureScaleYInSize);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Button::onPressStateChangedToPressed()
|
||||
|
@ -492,10 +500,18 @@ void Button::onPressStateChangedToPressed()
|
|||
_buttonNormalRenderer->setScale(_normalTextureScaleXInSize +_zoomScale, _normalTextureScaleYInSize + _zoomScale);
|
||||
|
||||
_titleRenderer->stopAllActions();
|
||||
if (_unifySize)
|
||||
{
|
||||
_titleRenderer->setScaleX(1.0f + _zoomScale);
|
||||
_titleRenderer->setScaleY(1.0f + _zoomScale);
|
||||
}
|
||||
else
|
||||
{
|
||||
_titleRenderer->setScaleX(_normalTextureScaleXInSize + _zoomScale);
|
||||
_titleRenderer->setScaleY(_normalTextureScaleYInSize + _zoomScale);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Button::onPressStateChangedToDisabled()
|
||||
|
@ -582,6 +598,10 @@ void Button::adaptRenderers()
|
|||
|
||||
Size Button::getVirtualRendererSize() const
|
||||
{
|
||||
if (_unifySize)
|
||||
{
|
||||
return this->getNormalSize();
|
||||
}
|
||||
Size titleSize = _titleRenderer->getContentSize();
|
||||
if (!_normalTextureLoaded && _titleRenderer->getString().size() > 0) {
|
||||
return titleSize;
|
||||
|
@ -839,7 +859,7 @@ void Button::copySpecialProperties(Widget *widget)
|
|||
}
|
||||
|
||||
}
|
||||
Size Button::getNormalSize()
|
||||
Size Button::getNormalSize() const
|
||||
{
|
||||
Size titleSize;
|
||||
if (_titleRenderer != nullptr)
|
||||
|
|
|
@ -234,7 +234,7 @@ protected:
|
|||
virtual Widget* createCloneInstance() override;
|
||||
virtual void copySpecialProperties(Widget* model) override;
|
||||
|
||||
virtual Size getNormalSize();
|
||||
virtual Size getNormalSize() const;
|
||||
protected:
|
||||
Scale9Sprite* _buttonNormalRenderer;
|
||||
Scale9Sprite* _buttonClickedRenderer;
|
||||
|
|
Loading…
Reference in New Issue