Skip to content

cc.LabelBMFont issues #1714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 24, 2014
Merged

cc.LabelBMFont issues #1714

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c13125e
Merge pull request #1 from cocos2d/develop
bassarisse Sep 26, 2013
e87fec4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 in…
bassarisse Mar 22, 2014
2ebf9c1
Multiline fixes on LabelBMFont: calculation for line break, empty lin…
bassarisse Mar 22, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions cocos2d/label_nodes/CCLabelBMFont.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -979,7 +979,8 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{
start_line = false;
startOfWord = -1;
startOfLine = -1;
i+= justSkipped;
j--;
skip -= justSkipped;
line++;

if (i >= stringLength)
Expand Down Expand Up @@ -1083,6 +1084,11 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{
if (this._string[ctr].charCodeAt(0) == 10 || this._string[ctr].charCodeAt(0) == 0) {
var lineWidth = 0;
var line_length = last_line.length;
// if last line is empty we must just increase lineNumber and work with next line
if (line_length == 0) {
lineNumber++;
continue;
}
var index = i + line_length - 1 + lineNumber;
if (index < 0) continue;

Expand Down Expand Up @@ -1245,11 +1251,11 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{
},

_getLetterPosXLeft:function (sp) {
return sp.getPositionX() * this._scaleX + (sp.getContentSize().width * this._scaleX * sp.getAnchorPoint().x);
return sp.getPositionX() * this._scaleX - (sp.getContentSize().width * this._scaleX * sp.getAnchorPoint().x);
},

_getLetterPosXRight:function (sp) {
return sp.getPositionX() * this._scaleX - (sp.getContentSize().width * this._scaleX * sp.getAnchorPoint().x);
return sp.getPositionX() * this._scaleX + (sp.getContentSize().width * this._scaleX * (1 - sp.getAnchorPoint().x));
}
});

Expand Down