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

Merge pull request #12471 from andyque/fix-rapidjson-assert 

[ci skip]fixed unintended spaces in string
This commit is contained in:
子龙山人 2015-06-23 10:39:36 +08:00
parent 0f5c343e1e 931011809d
commit eb9a2784fb
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextTest/UITextTest.cpp
View File

@ -232,8 +232,7 @@ bool UITextTest_IgnoreConentSize::init()
widgetSize.height / 2.0f)); widgetSize.height / 2.0f));
leftText->ignoreContentAdaptWithSize(false); leftText->ignoreContentAdaptWithSize(false);
leftText->setTextAreaSize(Size(60,60)); leftText->setTextAreaSize(Size(60,60));
leftText->setString("Text line with break\nText line \ leftText->setString("Text line with break\nText line with break\nText line with break\nText line with break\n");
with break\nText line with break\nText line with break\n");
leftText->setTouchScaleChangeEnabled(true); leftText->setTouchScaleChangeEnabled(true);
leftText->setTouchEnabled(true); leftText->setTouchEnabled(true);
_uiLayer->addChild(leftText); _uiLayer->addChild(leftText);
@ -243,8 +242,7 @@ bool UITextTest_IgnoreConentSize::init()
"fonts/Marker Felt.ttf",10); "fonts/Marker Felt.ttf",10);
rightText->setPosition(Vec2(widgetSize.width / 2.0f + 50, rightText->setPosition(Vec2(widgetSize.width / 2.0f + 50,
widgetSize.height / 2.0f)); widgetSize.height / 2.0f));
rightText->setString("Text line with break\nText line \ rightText->setString("Text line with break\nText line with break\nText line with break\nText line with break\n");
with break\nText line with break\nText line with break\n");
//note:setTextAreaSize must be used with ignoreContentAdaptWithSize(false) //note:setTextAreaSize must be used with ignoreContentAdaptWithSize(false)
rightText->setTextAreaSize(Size(100,30)); rightText->setTextAreaSize(Size(100,30));
rightText->ignoreContentAdaptWithSize(false); rightText->ignoreContentAdaptWithSize(false);