Merge pull request #411 from zilongshanren/improve-jsb-label-content-size

fix label size in EditBox
This commit is contained in:
Wang Nan
2016-11-25 14:49:13 +08:00
committed by GitHub
+2 -1
View File
@@ -1251,9 +1251,10 @@ void Label::createSpriteForSystemFont(const FontDefinition& fontDef)
auto newSize = _textSprite->getContentSize();
if(_overflow == Overflow::RESIZE_HEIGHT) {
this->setContentSize(Size(_contentSize.width, newSize.height));
} else if (_overflow == Overflow::NONE) {
} else {
this->setContentSize(newSize);
}
texture->release();
if (_blendFuncDirty)
{