mirror of https://github.com/axmolengine/axmol.git
issue #1056: Update ios project.
This commit is contained in:
parent
d67ea955f2
commit
d36933d542
|
@ -1 +1 @@
|
||||||
eb7dd21e7b4067a99d2106e2c4713caf43cb1064
|
27262a27cf46748c95185438b536e5ba4b6a7a44
|
|
@ -1170,7 +1170,7 @@ void BitmapFontMultiLineAlignment::ccTouchesMoved(cocos2d::CCSet *pTouches, coco
|
||||||
this->m_pArrowsShouldRetain->setPosition(ccp(MAX(MIN(location.x, ArrowsMax*winSize.width), ArrowsMin*winSize.width),
|
this->m_pArrowsShouldRetain->setPosition(ccp(MAX(MIN(location.x, ArrowsMax*winSize.width), ArrowsMin*winSize.width),
|
||||||
this->m_pArrowsShouldRetain->getPosition().y));
|
this->m_pArrowsShouldRetain->getPosition().y));
|
||||||
|
|
||||||
float labelWidth = abs(this->m_pArrowsShouldRetain->getPosition().x - this->m_pLabelShouldRetain->getPosition().x) * 2;
|
float labelWidth = fabs(this->m_pArrowsShouldRetain->getPosition().x - this->m_pLabelShouldRetain->getPosition().x) * 2;
|
||||||
|
|
||||||
this->m_pLabelShouldRetain->setWidth(labelWidth);
|
this->m_pLabelShouldRetain->setWidth(labelWidth);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1447,7 +1447,7 @@ void FileUtilsTest::onEnter()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
|
#if 0 // TODO:(CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
|
||||||
// Testint CCFileUtils API
|
// Testint CCFileUtils API
|
||||||
bool ret = false;
|
bool ret = false;
|
||||||
ret = CCFileUtils::iPhoneRetinaDisplayFileExistsAtPath("Images/bugs/test_issue_1179.png");
|
ret = CCFileUtils::iPhoneRetinaDisplayFileExistsAtPath("Images/bugs/test_issue_1179.png");
|
||||||
|
|
Loading…
Reference in New Issue