Merge pull request #12158 from WenhaiLin/v3-letter-space

zilongshanren · zilongshanren · commit 831ca47b13e5 · 2015-06-04T10:51:25.000+08:00
Label:Fixed letter spacing may be wrong.
diff --git a/cocos/2d/CCLabelTextFormatter.cpp b/cocos/2d/CCLabelTextFormatter.cpp
@@ -407,7 +407,7 @@ bool LabelTextFormatter::createStringSprites(Label *theLabel)
             }
         }
         
-        letterPosition.x = (nextFontPositionX + charXOffset + kernings[i]) / contentScaleFactor;
+        letterPosition.x = (nextFontPositionX + charXOffset) / contentScaleFactor;
         letterPosition.y = (nextFontPositionY - charYOffset) / contentScaleFactor;
                
         if( theLabel->recordLetterInfo(letterPosition, tempDefinition, i) == false)
@@ -417,6 +417,10 @@ bool LabelTextFormatter::createStringSprites(Label *theLabel)
         }
         
         nextFontPositionX += charAdvance + theLabel->_additionalKerning;
+        if (i < stringLen - 1)
+        {
+            nextFontPositionX += kernings[i + 1];
+        }
         
         auto letterRight = letterPosition.x + tempDefinition.width;
         if (longestLine < letterRight)

Original file line number	Diff line number	Diff line change
`@@ -407,7 +407,7 @@ bool LabelTextFormatter::createStringSprites(Label *theLabel)`
`407`	`407`	`}`
`408`	`408`	`}`
`409`	`409`
`410`		`- letterPosition.x = (nextFontPositionX + charXOffset + kernings[i]) / contentScaleFactor;`
	`410`	`+ letterPosition.x = (nextFontPositionX + charXOffset) / contentScaleFactor;`
`411`	`411`	`letterPosition.y = (nextFontPositionY - charYOffset) / contentScaleFactor;`
`412`	`412`
`413`	`413`	`if( theLabel->recordLetterInfo(letterPosition, tempDefinition, i) == false)`
`@@ -417,6 +417,10 @@ bool LabelTextFormatter::createStringSprites(Label *theLabel)`
`417`	`417`	`}`
`418`	`418`
`419`	`419`	`nextFontPositionX += charAdvance + theLabel->_additionalKerning;`
	`420`	`+ if (i < stringLen - 1)`
	`421`	`+ {`
	`422`	`+ nextFontPositionX += kernings[i + 1];`
	`423`	`+ }`
`420`	`424`
`421`	`425`	`auto letterRight = letterPosition.x + tempDefinition.width;`
`422`	`426`	`if (longestLine < letterRight)`