Merge pull request #9904 from Dhilan007/v3-systemfont-android-fix

Fixed dead loop when the width of label[system font] smaller then one word of the string on android

cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxBitmap.java

@@ -384,7 +384,7 @@ public class Cocos2dxBitmap {
                     i = lastIndexOfSpace + 1; // skip space
                 } else {
                     // Should not exceed the width.
-                    if (tempWidth > maxWidth) {
+                    if (tempWidth > maxWidth && i != start + 1) {
                         strList.add(string.substring(start, i - 1));
                         // Compute from previous char.
                         --i;

tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp

@@ -83,7 +83,8 @@ static std::function<Layer*()> createFunctions[] =
     CL(LabelAdditionalKerningTest),
     CL(LabelIssue8492Test),
     CL(LabelMultilineWithOutline),
-    CL(LabelIssue9255Test)
+    CL(LabelIssue9255Test),
+    CL(LabelSmallDimensionsTest)
 };
 
 #define MAX_LAYER    (sizeof(createFunctions) / sizeof(createFunctions[0]))
@@ -1877,3 +1878,20 @@ std::string LabelIssue9255Test::subtitle() const
 {
     return "switch to desktop and switch back. Crashed!!!";
 }
+
+LabelSmallDimensionsTest::LabelSmallDimensionsTest()
+{
+    auto label = Label::createWithSystemFont("Hello World!", "fonts/arial.ttf", 24, Size(30,100));
+    label->setPosition(VisibleRect::center());
+    addChild(label);
+}
+
+std::string LabelSmallDimensionsTest::title() const
+{
+    return "Test create Label[system font] with small dimensions";
+}
+
+std::string LabelSmallDimensionsTest::subtitle() const
+{
+    return "Program should not dead loop";
+}

tests/cpp-tests/Classes/LabelTest/LabelTestNew.h

@@ -544,5 +544,16 @@ public:
     virtual std::string subtitle() const override;
 };
 
+class LabelSmallDimensionsTest : public AtlasDemoNew
+{
+public:
+    CREATE_FUNC(LabelSmallDimensionsTest);
+
+    LabelSmallDimensionsTest();
+
+    virtual std::string title() const override;
+    virtual std::string subtitle() const override;
+};
+
 
 #endif