Fixes hAlignment argument isn't used in Label::initWithTTF and refactor few code in Label constructor.

This commit is contained in:
James Chen
2017-09-28 15:27:59 +08:00
parent 2fc025d77d
commit eed4b2fda6
2 changed files with 78 additions and 27 deletions
+77 -25
View File
@@ -172,7 +172,7 @@ private:
Label* Label::create()
{
auto ret = new (std::nothrow) Label;
auto ret = new (std::nothrow) Label();
if (ret)
{
@@ -184,10 +184,12 @@ Label* Label::create()
Label* Label::createWithSystemFont(const std::string& text, const std::string& font, float fontSize, const Size& dimensions /* = Size::ZERO */, TextHAlignment hAlignment /* = TextHAlignment::LEFT */, TextVAlignment vAlignment /* = TextVAlignment::TOP */)
{
auto ret = new (std::nothrow) Label(hAlignment,vAlignment);
auto ret = new (std::nothrow) Label();
if (ret)
{
ret->_hAlignment = hAlignment;
ret->_vAlignment = vAlignment;
ret->setSystemFontName(font);
ret->setSystemFontSize(fontSize);
ret->setDimensions(dimensions.width, dimensions.height);
@@ -204,7 +206,7 @@ Label* Label::createWithSystemFont(const std::string& text, const std::string& f
Label* Label::createWithTTF(const std::string& text, const std::string& fontFile, float fontSize, const Size& dimensions /* = Size::ZERO */, TextHAlignment hAlignment /* = TextHAlignment::LEFT */, TextVAlignment vAlignment /* = TextVAlignment::TOP */)
{
auto ret = new (std::nothrow) Label(hAlignment,vAlignment);
auto ret = new (std::nothrow) Label();
if (ret && ret->initWithTTF(text, fontFile, fontSize, dimensions, hAlignment, vAlignment))
{
@@ -218,7 +220,7 @@ Label* Label::createWithTTF(const std::string& text, const std::string& fontFile
Label* Label::createWithTTF(const TTFConfig& ttfConfig, const std::string& text, TextHAlignment hAlignment /* = TextHAlignment::CENTER */, int maxLineWidth /* = 0 */)
{
auto ret = new (std::nothrow) Label(hAlignment);
auto ret = new (std::nothrow) Label();
if (ret && ret->initWithTTF(ttfConfig, text, hAlignment, maxLineWidth))
{
@@ -237,17 +239,20 @@ Label* Label::createWithBMFont(const std::string& fntDataString,
int maxLineWidth /* = 0 */,
const Vec2& imageOffset /* = Vec2::ZERO */)
{
auto ret = new (std::nothrow) Label(hAlignment);
spriteFrame->autorelease();
if (ret && ret->setBMFontFilePath(fntDataString,
spriteFrame,
imageOffset))
{
ret->setMaxLineWidth(maxLineWidth);
ret->setString(text);
ret->autorelease();
spriteFrame->autorelease(); //FIXME: Why to autorelease sprite frame here?
return ret;
auto ret = new (std::nothrow) Label();
if (ret != nullptr)
{
ret->_hAlignment = hAlignment;
if (ret->setBMFontFilePath(fntDataString, spriteFrame, imageOffset))
{
ret->setMaxLineWidth(maxLineWidth);
ret->setString(text);
ret->autorelease();
return ret;
}
}
delete ret;
@@ -312,10 +317,11 @@ bool Label::setCharMap(const std::string& plistFile)
return true;
}
bool Label::initWithTTF(const std::string& text, const std::string& fontFilePath, float fontSize,
const Size& dimensions, TextHAlignment hAlignment, TextVAlignment vAlignment)
{
_hAlignment = hAlignment;
_vAlignment = vAlignment;
if (FileUtils::getInstance()->isFileExist(fontFilePath))
{
TTFConfig ttfConfig(fontFilePath, fontSize, GlyphCollection::DYNAMIC);
@@ -331,6 +337,7 @@ bool Label::initWithTTF(const std::string& text, const std::string& fontFilePath
bool Label::initWithTTF(const TTFConfig& ttfConfig, const std::string& text, TextHAlignment hAlignment, int maxLineWidth)
{
_hAlignment = hAlignment;
if (FileUtils::getInstance()->isFileExist(ttfConfig.fontFilePath) && setTTFConfig(ttfConfig))
{
setMaxLineWidth(maxLineWidth);
@@ -372,23 +379,68 @@ bool Label::setCharMap(const std::string& charMapFile, int itemWidth, int itemHe
return true;
}
Label::Label(TextHAlignment hAlignment /* = TextHAlignment::LEFT */,
TextVAlignment vAlignment /* = TextVAlignment::TOP */)
: _textSprite(nullptr)
Label::Label()
: _systemFont("Helvetica")
, _textSprite(nullptr)
, _shadowNode(nullptr)
, _fontAtlas(nullptr)
, _reusedLetter(nullptr)
, _horizontalKernings(nullptr)
, _purgeTextureListener(nullptr)
, _resetTextureListener(nullptr)
#if CC_LABEL_DEBUG_DRAW
, _debugDrawNode(nullptr)
#endif
, _fntSpriteFrame(nullptr)
, _underlineNode(nullptr)
, _reusedLetter(nullptr)
, _effectColorF(Color4F::BLACK)
, _textColor(Color4B::WHITE)
, _textColorF(Color4F::WHITE)
, _uniformEffectColor(0)
, _uniformTextColor(0)
, _shadowOpacity(0)
, _blendFunc(BlendFunc::ALPHA_PREMULTIPLIED)
, _numberOfLines(0)
, _lengthOfString(0)
, _outlineSize(0.0f)
, _systemFontSize(12.0f)
, _lineHeight(0.0f)
, _lineSpacing(0.0f)
, _additionalKerning(0.0f)
, _maxLineWidth(0.0f)
, _labelWidth(0.0f)
, _labelHeight(0.0f)
, _textDesiredHeight(0.0f)
, _letterOffsetY(0.0f)
, _tailoredTopY(0.0f)
, _tailoredBottomY(0.0f)
, _shadowBlurRadius(0.0f)
, _bmFontSize(-1.0f)
, _bmfontScale(1.0f)
, _originalFontSize(0.0f)
, _currLabelEffect(LabelEffect::NORMAL)
, _currentLabelType(LabelType::STRING_TEXTURE)
, _overflow(Overflow::NONE)
, _hAlignment(TextHAlignment::LEFT)
, _vAlignment(TextVAlignment::TOP)
, _systemFontDirty(false)
, _contentDirty(false)
, _lineBreakWithoutSpaces(false)
, _boldEnabled(false)
, _italicsEnabled(false)
, _underlineNode(nullptr)
, _strikethroughEnabled(false)
, _fntSpriteFrame(nullptr)
, _insideBounds(true)
, _isOpacityModifyRGB(false)
, _enableWrap(true)
, _clipEnabled(false)
, _blendFuncDirty(false)
, _useDistanceField(false)
, _useA8Shader(false)
, _shadowDirty(false)
, _shadowEnabled(false)
{
setAnchorPoint(Vec2::ANCHOR_MIDDLE);
reset();
_hAlignment = hAlignment;
_vAlignment = vAlignment;
setColor(Color3B::WHITE);
#if CC_LABEL_DEBUG_DRAW
_debugDrawNode = DrawNode::create();
@@ -531,7 +583,7 @@ void Label::reset()
// ETC1 ALPHA supports, for LabelType::BMFONT & LabelType::CHARMAP
static Texture2D* _getTexture(Label* label)
{
{
struct _FontAtlasPub : public FontAtlas
{
Texture2D* getTexture()
+1 -2
View File
@@ -617,8 +617,7 @@ CC_CONSTRUCTOR_ACCESS:
* Constructor of Label.
* @js NA
*/
Label(TextHAlignment hAlignment = TextHAlignment::LEFT,
TextVAlignment vAlignment = TextVAlignment::TOP);
Label();
/**
* Destructor of Label.