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

Label:Fixed letter can be flipped.

This commit is contained in:
WenhaiLin 2015-08-11 10:06:14 +08:00
parent c65f09f63e
commit eeb4a38715
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cocos/2d/CCLabel.cpp
View File

@ -79,6 +79,15 @@ public:
float y1 = _offsetPosition.y;
float x2 = x1 + size.width;
float y2 = y1 + size.height;
if (_flippedX)
{
std::swap(x1, x2);
}
if (_flippedY)
{
std::swap(y1, y2);
}
float x = _transformToBatch.m[12];
float y = _transformToBatch.m[13];

2
tests/game-controller-test/Classes/GameControllerTest.cpp
View File

@ -414,7 +414,7 @@ void GameControllerTest::createControllerSprite(ControllerHolder& holder)
holder._holderNode->addChild(buttonL2);
auto buttonR2 = Sprite::create("R2.png");
buttonR2->setPosition(98-220,910);
buttonR2->setPosition(998-220,910);
holder._holderNode->addChild(buttonR2);
holder._buttonL2 = Sprite::create("L2.png");