From 712b093b2724fa1011ba0a9f8031e8e8cfaa57bd Mon Sep 17 00:00:00 2001
From: Jordi Vilalta Prat <jordi.vilalta@socialpoint.es>
Date: Wed, 4 Apr 2018 05:53:16 +0200
Subject: [PATCH] Don't count spaces at the end of line as part of the line
 width (#18751)

---
 cocos/2d/CCLabelTextFormatter.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cocos/2d/CCLabelTextFormatter.cpp b/cocos/2d/CCLabelTextFormatter.cpp
index c826bed01b..82a3e77222 100644
--- a/cocos/2d/CCLabelTextFormatter.cpp
+++ b/cocos/2d/CCLabelTextFormatter.cpp
@@ -236,7 +236,10 @@ bool Label::multilineTextWrap(const std::function<int(const std::u32string&, int
                     nextLetterX += _horizontalKernings[letterIndex + 1];
                 nextLetterX += letterDef.xAdvance * _bmfontScale + _additionalKerning;
 
-                tokenRight = nextLetterX / contentScaleFactor;
+                if (tokenLen != 1 || !StringUtils::isUnicodeSpace(character))
+                {
+                    tokenRight = nextLetterX / contentScaleFactor;
+                }
             }
             nextChangeSize = true;