From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Tue, 4 Dec 2012 21:11:43 +0000 (+0100)
Subject: dynamic width right aligned rendering with Font
X-Git-Url: https://git.localhorst.tv/?a=commitdiff_plain;h=3326698517a8d607ccb4239c5d26606eaa1e50d4;p=l2e.git

dynamic width right aligned rendering with Font
---

diff --git a/src/graphics/Font.cpp b/src/graphics/Font.cpp
index ba5c64d..069d032 100644
--- a/src/graphics/Font.cpp
+++ b/src/graphics/Font.cpp
@@ -4,6 +4,7 @@
 #include "../loader/TypeDescription.h"
 
 #include <cmath>
+#include <cstring>
 #include <iostream>
 
 using geometry::Vector;
@@ -76,8 +77,12 @@ void Font::DrawStringRight(const char *s, SDL_Surface *dest, const Vector<int> &
 	if (!sprite) return;
 
 	int length(0);
-	while (length < maxWidth && s[length] != '\0') {
-		++length;
+	if (maxWidth > 0) {
+		while (length < maxWidth && s[length] != '\0') {
+			++length;
+		}
+	} else {
+		length = std::strlen(s);
 	}
 	Vector<int> position(positionIn.X() - length * CharWidth(), positionIn.Y());
 
@@ -124,7 +129,16 @@ void Font::DrawNumber(int numberIn, SDL_Surface *dest, const Vector<int> &positi
 void Font::DrawNumberRight(int number, SDL_Surface *dest, const Vector<int> &positionIn, int digits) const {
 	if (!sprite) return;
 
-	Vector<int> position(positionIn.X() - digits * CharWidth(), positionIn.Y());
+	Vector<int> position(positionIn);
+	if (digits > 0) {
+		position.X() -= digits * CharWidth();
+	} else if (number == 0) {
+		position.X() -= CharWidth();
+	} else {
+		for (int i = number; i > 0; i /= 10) {
+			position.X() -= CharWidth();
+		}
+	}
 
 	DrawNumber(number, dest, position, digits);
 }