added string dimensions calculation functions

diff --git a/src/graphics/Font.cpp b/src/graphics/Font.cpp
index 94d451ae7a9f7d272cc706599c9ce4b5b774849d..42772b2612088275307447d5cd5c91443cedc5c4 100644 (file)
--- a/src/graphics/Font.cpp
+++ b/src/graphics/Font.cpp
@@ -21,6 +21,35 @@ using std::pow;
 
 namespace graphics {
 
+int Font::StringWidth(const char *s) const {
+       int width(0), col(0);
+       for (int i(0); s[i]; ++i) {
+               if (s[i] == '\n') {
+                       if (width < col) {
+                               width = col;
+                       }
+                       col = 0;
+               } else {
+                       ++col;
+               }
+       }
+       return (width < col ? col : width) * CharWidth();
+}
+
+int Font::StringHeight(const char *s) const {
+       if (*s == '\0') {
+               return 0;
+       }
+       int height(1);
+       for (; *s; ++s) {
+               if (*s == '\n') {
+                       ++height;
+               }
+       }
+       return height * CharHeight();
+}
+
+
 void Font::DrawChar(char c, SDL_Surface *dest, const Vector<int> &position) const {
        if (!sprite) return;
 

diff --git a/src/graphics/Font.h b/src/graphics/Font.h
index 6a8a5c23c11e500e73969aecb9198550d6ce0b5e..a5d7b12d690019f0dfd070cd759cc1591521a94d 100644 (file)
--- a/src/graphics/Font.h
+++ b/src/graphics/Font.h
@@ -29,6 +29,9 @@ public:
 public:
        int CharWidth() const { return sprite->Width(); }
        int CharHeight() const { return sprite->Height(); }
+       int StringWidth(const char *) const;
+       int StringHeight(const char *) const;
+
        void DrawChar(char c, SDL_Surface *dest, const geometry::Vector<int> &position) const;
        void DrawString(const char *s, SDL_Surface *dest, const geometry::Vector<int> &position, int maxWidth = 0) const;
        void DrawStringRight(const char *s, SDL_Surface *dest, const geometry::Vector<int> &position, int maxWidth = 0) const;