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

Merge pull request #14543 from zilongshanren/fixLabelOverflowShrink 

fix label clamp when scaled with bmfont
This commit is contained in:
zilongshanren 2015-12-02 18:26:46 +08:00
parent 867664197e ed55d41858
commit 706e005c3d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/2d/CCLabel.cpp
View File

@ -840,14 +840,14 @@ bool Label::updateQuads()
_reusedRect.size.height -= clipTop; _reusedRect.size.height -= clipTop;
py -= clipTop; py -= clipTop;
} }
if (py - letterDef.height < _tailoredBottomY) if (py - letterDef.height * _bmfontScale < _tailoredBottomY)
{ {
_reusedRect.size.height = (py < _tailoredBottomY) ? 0.f : (py - _tailoredBottomY); _reusedRect.size.height = (py < _tailoredBottomY) ? 0.f : (py - _tailoredBottomY);
} }
} }
if(!_enableWrap){ if(!_enableWrap){
auto px = _lettersInfo[ctr].positionX + letterDef.width/2 + _linesOffsetX[_lettersInfo[ctr].lineIndex]; auto px = _lettersInfo[ctr].positionX + letterDef.width/2 * _bmfontScale + _linesOffsetX[_lettersInfo[ctr].lineIndex];
if(_labelWidth > 0.f){ if(_labelWidth > 0.f){
if (px > _contentSize.width || px < 0) { if (px > _contentSize.width || px < 0) {
if(_overflow == Overflow::CLAMP){ if(_overflow == Overflow::CLAMP){

2
cocos/2d/CCLabelTextFormatter.cpp
View File

@ -267,7 +267,7 @@ bool Label::isHorizontalClamp()
{ {
auto& letterDef = _fontAtlas->_letterDefinitions[_lettersInfo[ctr].utf16Char]; auto& letterDef = _fontAtlas->_letterDefinitions[_lettersInfo[ctr].utf16Char];
auto px = _lettersInfo[ctr].positionX + letterDef.width/2; auto px = _lettersInfo[ctr].positionX + letterDef.width/2 * _bmfontScale;
if(_labelWidth > 0.f){ if(_labelWidth > 0.f){
if (px > _contentSize.width) { if (px > _contentSize.width) {
letterClamp = true; letterClamp = true;