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

some more clean up for CCLabel

This commit is contained in:
carlo morgantini 2013-07-26 10:29:29 -07:00
parent 7d141a3f57
commit 76ebeb0676
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cocos2dx/label_nodes/CCLabel.h
View File

@ -47,6 +47,13 @@ public:
virtual ~Label();
Label();
virtual void setAlignment(TextAlignment alignment) = 0;
virtual void setWidth(float width) = 0;
virtual void setLineBreakWithoutSpace(bool breakWithoutSpace) = 0;
virtual void setScale(float scale) = 0;
virtual void setScaleX(float scaleX) = 0;
virtual void setScaleY(float scaleY) = 0;
// needs to go - TEST STUFF /////////////////////////////////////////////////////////////////////////
static Label* createWithBMFontOLD( const char* label, const char* bmfontFilePath, int lineSize = 0);

8
samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
View File

@ -40,7 +40,7 @@ Layer* restartAtlasAction();
static int sceneIdx = -1;
#define MAX_LAYER 32
#define MAX_LAYER 31
Layer* createAtlasLayer(int nIndex)
{
@ -77,9 +77,9 @@ Layer* createAtlasLayer(int nIndex)
case 26: return new LabelBMFontBounds();
case 27: return new TTFFontShadowAndStroke();
case 28: return new LabelBMFontNewTest();
case 29: return new NewLabelBMFontTestOld();
case 30: return new NewLabelBMFontTest();
case 31: return new NewLabelTTFTest();
//case 29: return new NewLabelBMFontTestOld();
case 29: return new NewLabelBMFontTest();
case 30: return new NewLabelTTFTest();
}
return NULL;