From c5ff21f7c6220953bd60e49879b31aee05d8f1cf Mon Sep 17 00:00:00 2001 From: WenhaiLin Date: Thu, 9 Apr 2015 16:18:24 +0800 Subject: [PATCH 1/2] [ci skip]Remove unwanted code. --- tests/cpp-tests/Classes/TextInputTest/TextInputTest.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/tests/cpp-tests/Classes/TextInputTest/TextInputTest.cpp b/tests/cpp-tests/Classes/TextInputTest/TextInputTest.cpp index 543990d7cc..a4f9f81216 100644 --- a/tests/cpp-tests/Classes/TextInputTest/TextInputTest.cpp +++ b/tests/cpp-tests/Classes/TextInputTest/TextInputTest.cpp @@ -151,14 +151,6 @@ void TextFieldTTFDefaultTest::onEnter() // add TextFieldTTF auto s = Director::getInstance()->getWinSize(); - std::string strSubtitle = subtitle(); - TTFConfig ttfConfig; - ttfConfig.fontFilePath = FONT_NAME; - ttfConfig.fontSize = 16; - auto subTitle = Label::createWithTTF(ttfConfig, strSubtitle.c_str()); - addChild(subTitle, 9999); - subTitle->setPosition(VisibleRect::center().x, VisibleRect::top().y - 60); - auto pTextField = TextFieldTTF::textFieldWithPlaceHolder("", FONT_NAME, FONT_SIZE); From f502c5900b7e3b4216c77cc73a2713fcc4799923 Mon Sep 17 00:00:00 2001 From: WenhaiLin Date: Thu, 9 Apr 2015 16:23:29 +0800 Subject: [PATCH 2/2] [ci skip]Remove unwanted code. --- .../TextureAtlasEncryptionTest.cpp | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/tests/cpp-tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp b/tests/cpp-tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp index 4647442cfa..b653799863 100644 --- a/tests/cpp-tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp +++ b/tests/cpp-tests/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp @@ -18,19 +18,7 @@ void TextureAtlasEncryptionDemo::onEnter() TestCase::onEnter(); auto s = Director::getInstance()->getWinSize(); - - auto label = Label::createWithTTF(title().c_str(), "fonts/arial.ttf", 28); - label->setPosition( Vec2(s.width/2, s.height * 0.75f) ); - this->addChild(label, 1); - - std::string strSubtitle = subtitle(); - if(strSubtitle.empty() == false) - { - auto subLabel = Label::createWithTTF(strSubtitle.c_str(), "fonts/Thonburi.ttf", 16); - subLabel->setPosition( Vec2(s.width/2, s.height-80) ); - this->addChild(subLabel, 1); - } - + // Load the non-encrypted atlas SpriteFrameCache::getInstance()->addSpriteFramesWithFile("Images/nonencryptedAtlas.plist", "Images/nonencryptedAtlas.pvr.ccz");