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

Fixed bugs and memory leak

This commit is contained in:
CaiWenzhi 2014-01-06 15:07:04 +08:00
parent 63fbec05e9
commit 4d1d225bd1
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cocos/gui/UILayout.cpp
View File

@ -85,6 +85,7 @@ _currentAlphaTestRef(1)
Layout::~Layout() Layout::~Layout()
{ {
setClippingEnabled(false);
} }
void Layout::onEnter() void Layout::onEnter()

4
cocos/gui/UIText.cpp
View File

@ -140,13 +140,11 @@ void Text::setScale(float fScale)
void Text::setScaleX(float fScaleX) void Text::setScaleX(float fScaleX)
{ {
Widget::setScaleX(fScaleX); Widget::setScaleX(fScaleX);
_normalScaleValueX = fScaleX;
} }
void Text::setScaleY(float fScaleY) void Text::setScaleY(float fScaleY)
{ {
Widget::setScaleY(fScaleY); Widget::setScaleY(fScaleY);
_normalScaleValueY = fScaleY;
} }
bool Text::isTouchScaleChangeEnabled() bool Text::isTouchScaleChangeEnabled()
@ -169,6 +167,8 @@ void Text::onPressStateChangedToPressed()
{ {
return; return;
} }
_normalScaleValueX = getScaleX();
_normalScaleValueY = getScaleY();
clickScale(_normalScaleValueX + _onSelectedScaleOffset, _normalScaleValueY + _onSelectedScaleOffset); clickScale(_normalScaleValueX + _onSelectedScaleOffset, _normalScaleValueY + _onSelectedScaleOffset);
} }