GRAPHICS: Rename align to horizontal alignment

xoreos · Nov 24, 2017 · 3d519cd · 3d519cd
1 parent f5ee241
commit 3d519cd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/src/graphics/aurora/highlightabletext.cpp b/src/graphics/aurora/highlightabletext.cpp
@@ -24,8 +24,8 @@ namespace Graphics {
 
 namespace Aurora {
 
-HighlightableText::HighlightableText(const FontHandle &font, const Common::UString &str, float r, float g, float b, float a, float align) :
-	Text(font, str, r, g, b, a, align) {
+HighlightableText::HighlightableText(const FontHandle &font, const Common::UString &str, float r, float g, float b, float a, float halign) :
+	Text(font, str, r, g, b, a, halign) {
 }
 
 HighlightableText::~HighlightableText() {

diff --git a/src/graphics/aurora/highlightabletext.h b/src/graphics/aurora/highlightabletext.h
@@ -32,7 +32,7 @@ class HighlightableText: public Text, public Highlightable {
 
   public:
 	HighlightableText(const FontHandle &font, const Common::UString &str,
-	     float r = 1.0f, float g = 1.0f, float b = 1.0f, float a = 1.0f, float align = 0.0f);
+	     float r = 1.0f, float g = 1.0f, float b = 1.0f, float a = 1.0f, float halign = 0.0f);
 	~HighlightableText();
 
 	void render(RenderPass pass);

diff --git a/src/graphics/aurora/text.cpp b/src/graphics/aurora/text.cpp
@@ -34,9 +34,9 @@ namespace Graphics {
 namespace Aurora {
 
 Text::Text(const FontHandle &font, const Common::UString &str,
-		float r, float g, float b, float a, float align) :
+		float r, float g, float b, float a, float halign) :
 	Graphics::GUIElement(Graphics::GUIElement::kGUIElementFront),
-	_r(r), _g(g), _b(b), _a(a), _font(font), _x(0.0f), _y(0.0f), _align(align),
+	_r(r), _g(g), _b(b), _a(a), _font(font), _x(0.0f), _y(0.0f), _halign(halign),
 	_disableColorTokens(false) {
 
 	set(str);
@@ -94,8 +94,8 @@ void Text::unsetColor() {
 	setColor(1.0f, 1.0f, 1.0f, 1.0f);
 }
 
-void Text::setAlign(float align) {
-	_align = align;
+void Text::setHorizontalAlign(float halign) {
+	_halign = halign;
 }
 
 const Common::UString &Text::get() const {
@@ -284,8 +284,8 @@ void Text::drawLine(const Common::UString &line, float maxLength,
 
 	Font &font = _font.getFont();
 
-	// Align
-	glTranslatef(roundf((maxLength - font.getLineWidth(line)) * _align), 0.0f, 0.0f);
+	// Horizontal Align
+	glTranslatef(roundf((maxLength - font.getLineWidth(line)) * _halign), 0.0f, 0.0f);
 
 	// Draw line
 	for (Common::UString::iterator s = line.begin(); s != line.end(); ++s, position++) {

diff --git a/src/graphics/aurora/text.h b/src/graphics/aurora/text.h
@@ -41,7 +41,7 @@ namespace Aurora {
 class Text : public GUIElement {
 public:
 	Text(const FontHandle &font, const Common::UString &str,
-	     float r = 1.0f, float g = 1.0f, float b = 1.0f, float a = 1.0f, float align = 0.0f);
+	     float r = 1.0f, float g = 1.0f, float b = 1.0f, float a = 1.0f, float halign = 0.0f);
 	~Text();
 
 	const Common::UString &get() const;
@@ -52,7 +52,7 @@ class Text : public GUIElement {
 	void setPosition(float x, float y, float z = -FLT_MAX);
 	void setColor(float r, float g, float b, float a);
 	void unsetColor();
-	void setAlign(float align);
+	void setHorizontalAlign(float halign);
 
 	/** Change the font of the text. */
 	void setFont(const Common::UString &fnt);
@@ -84,7 +84,7 @@ class Text : public GUIElement {
 	float _width;
 	float _height;
 
-	float _align;
+	float _halign;
 
 	Common::UString _str;
 	ColorPositions  _colors;