Просмотр исходного кода

Use setPositionMode() accessor when possible

- Gives some extra flexibility if things need to
  happen when this changes.
Nur Monson 12 лет назад
Родитель
Сommit
6f5dc068e0

+ 3 - 3
Core/Contents/Source/PolyScreenImage.cpp

@@ -46,7 +46,7 @@ ScreenImage::ScreenImage(const String& fileName) : ScreenShape(ScreenShape::SHAP
 	height = texture->getHeight();	
 	setShapeSize(width, height);	
 	
-	positionMode = POSITION_TOPLEFT;
+	setPositionMode(POSITION_TOPLEFT);
 }
 
 ScreenImage::ScreenImage(Image *image) : ScreenShape(ScreenShape::SHAPE_RECT,1,1) {
@@ -59,7 +59,7 @@ ScreenImage::ScreenImage(Image *image) : ScreenShape(ScreenShape::SHAPE_RECT,1,1
 	height = texture->getHeight();	
 	setShapeSize(width, height);	
 	
-	positionMode = POSITION_TOPLEFT;	
+	setPositionMode(POSITION_TOPLEFT);	
 }
 
 ScreenImage::ScreenImage(Texture *texture) : ScreenShape(ScreenShape::SHAPE_RECT,1,1) {
@@ -72,7 +72,7 @@ ScreenImage::ScreenImage(Texture *texture) : ScreenShape(ScreenShape::SHAPE_RECT
 	height = texture->getHeight();	
 	setShapeSize(width, height);	
 	
-	positionMode = POSITION_TOPLEFT;	
+	setPositionMode(POSITION_TOPLEFT);
 }
 
 ScreenImage::~ScreenImage() {

+ 1 - 1
Core/Contents/Source/PolyScreenLabel.cpp

@@ -37,7 +37,7 @@ ScreenLabel::ScreenLabel(const String& text, int size, const String& fontName, i
 	label = new Label(CoreServices::getInstance()->getFontManager()->getFontByName(fontName), text, size, amode, premultiplyAlpha);
 	texture = NULL;
 	updateTexture();
-	positionMode = POSITION_TOPLEFT;
+	setPositionMode(POSITION_TOPLEFT);
 	colorAffectsChildren = false;
 	positionAtBaseline = true;
 }

+ 2 - 2
Core/Contents/Source/PolyScreenShape.cpp

@@ -45,7 +45,7 @@ ScreenShape::ScreenShape(int shapeType, Number option1, Number option2, Number o
 		
 	buildShapeMesh();
 	
-	positionMode = POSITION_CENTER;
+	setPositionMode(POSITION_CENTER);
 	strokeEnabled = false;
 }
 
@@ -66,7 +66,7 @@ void ScreenShape::operator=(const ScreenShape& copy) {
 	
 	strokeColor = copy.strokeColor;
 	
-	positionMode = POSITION_CENTER;
+	setPositionMode(POSITION_CENTER);
 	strokeEnabled = copy.strokeEnabled;	
 
 }

+ 1 - 1
Modules/Contents/UI/Source/PolyUITextInput.cpp

@@ -60,7 +60,7 @@ UITextInput::UITextInput(bool multiLine, Number width, Number height) : UIElemen
 	
 	numLines = 0;
 	
-	this->positionMode = ScreenEntity::POSITION_TOPLEFT;
+	setPositionMode(POSITION_TOPLEFT);
 	Config *conf = CoreServices::getInstance()->getConfig();	
 	
 	if(multiLine)