pass point as reference in graphics Draw functions

[l2e.git] / src / graphics / Menu.h

diff --git a/src/graphics/Menu.h b/src/graphics/Menu.h
index 26b9d0527033484ee594f72d7342b816b2d46898..c879cc979556f9b9c1d94d60f7552f5cf338d36e 100644 (file)
--- a/src/graphics/Menu.h
+++ b/src/graphics/Menu.h
@@ -27,12 +27,12 @@ class Menu {
 
 public:
        Menu();
-       Menu(const Font *font, const Font *disabledFont, const Sprite *cursor, int charsPerEntry, int rows, int rowGap = 0, int iconSpace = 0, int cols = 1, int colGap = 0, int charsPerNumber = 0, char delimiter = ':');
+       Menu(const Font *font, const Font *disabledFont, const Sprite *cursor, int charsPerEntry, int rows, int rowGap = 0, int iconSpace = 0, int cols = 1, int colGap = 0, int charsPerNumber = 0, char delimiter = ':', int charsPerAdditionalText = 0, int additionalTextGap = 0);
 
 public:
        int Width() const;
        int Height() const;
-       int ColWidth() const { return iconSpace + font->CharWidth() * (charsPerEntry + charsPerNumber) + (charsPerNumber ? font->CharWidth() : 0); }
+       int ColWidth() const;
        int RowHeight() const { return font->CharHeight() + rowGap; }
        int CharsPerEntry() const { return charsPerEntry; }
 
@@ -54,14 +54,14 @@ public:
        T &ValueAt(int index) { return entries[index].value; }
        const T &ValueAt(int index) const { return entries[index].value; }
 
-       void Add(const char *title, const T &value, bool enabled = true, const Sprite *icon = 0, int number = 0) { entries.push_back(Entry(title, value, enabled, icon, number)); }
+       void Add(const char *title, const T &value, bool enabled = true, const Sprite *icon = 0, int number = 0, const char *additionalText = 0) { entries.push_back(Entry(title, value, enabled, icon, number, additionalText)); }
        void AddEmptyEntry() { entries.push_back(Entry(0, T(), false)); }
        void Disable(int index) { entries[index].enabled = false; }
        void Enable(int index) { entries[index].enabled = true; }
        void Reserve(int n) { entries.reserve(n); }
        void Clear() { entries.clear(); }
 
-       void Draw(SDL_Surface *dest, geometry::Point<int> position) const;
+       void Draw(SDL_Surface *dest, const geometry::Point<int> &position) const;
 
 private:
        int GetRow(int index) const { return index / cols; }
@@ -69,9 +69,10 @@ private:
 
 private:
        struct Entry {
-               Entry(const char *title, const T &value, bool enabled = true, const Sprite *icon = 0, int number = 0)
-               : title(title), icon(icon), number(number), value(value), enabled(enabled) { }
+               Entry(const char *title, const T &value, bool enabled = true, const Sprite *icon = 0, int number = 0, const char *additionalText = 0)
+               : title(title), additionalText(additionalText), icon(icon), number(number), value(value), enabled(enabled) { }
                const char *title;
+               const char *additionalText;
                const Sprite *icon;
                int number;
                T value;
@@ -90,6 +91,8 @@ private:
        int selected;
        int topRow;
        int charsPerNumber;
+       int charsPerAdditionalText;
+       int additionalTextGap;
        char delimiter;
 
 };
@@ -109,12 +112,14 @@ Menu<T>::Menu()
 , selected(0)
 , topRow(0)
 , charsPerNumber(0)
+, charsPerAdditionalText(0)
+, additionalTextGap(0)
 , delimiter(':') {
 
 }
 
 template<class T>
-Menu<T>::Menu(const Font *font, const Font *disabledFont, const Sprite *cursor, int charsPerEntry, int rows, int rowGap, int iconSpace, int cols, int colGap, int charsPerNumber, char delimiter)
+Menu<T>::Menu(const Font *font, const Font *disabledFont, const Sprite *cursor, int charsPerEntry, int rows, int rowGap, int iconSpace, int cols, int colGap, int charsPerNumber, char delimiter, int charsPerAdditionalText, int additionalTextGap)
 : font(font)
 , disabledFont(disabledFont ? disabledFont : font)
 , cursor(cursor)
@@ -127,11 +132,26 @@ Menu<T>::Menu(const Font *font, const Font *disabledFont, const Sprite *cursor,
 , selected(0)
 , topRow(0)
 , charsPerNumber(charsPerNumber)
+, charsPerAdditionalText(charsPerAdditionalText)
+, additionalTextGap(additionalTextGap)
 , delimiter(delimiter) {
 
 }
 
 
+template<class T>
+int Menu<T>::ColWidth() const {
+       int width(iconSpace);
+       width += font->CharWidth() * (charsPerEntry + charsPerNumber);
+       if (charsPerNumber) {
+               width += font->CharWidth();
+       }
+       if (charsPerAdditionalText) {
+               width += additionalTextGap + charsPerAdditionalText * font->CharWidth();
+       }
+       return width;
+}
+
 template<class T>
 int Menu<T>::Width() const {
        return cols * ColWidth() + (cols - 1) * colGap;
@@ -176,7 +196,7 @@ void Menu<T>::SelectIndex(int index) {
 
 
 template<class T>
-void Menu<T>::Draw(SDL_Surface *dest, geometry::Point<int> position) const {
+void Menu<T>::Draw(SDL_Surface *dest, const geometry::Point<int> &position) const {
        int start(topRow * cols);
        int slots(rows * cols);
        int items(entries.size() - start);
@@ -189,15 +209,24 @@ void Menu<T>::Draw(SDL_Surface *dest, geometry::Point<int> position) const {
                if (entries[start + i].icon) {
                        entries[start + i].icon->Draw(dest, position + iconOffset);
                }
-               geometry::Vector<int> labelOffset(iconOffset.X() + iconSpace, iconOffset.Y());
+               geometry::Vector<int> textOffset(iconOffset.X() + iconSpace, iconOffset.Y());
                const Font *usedFont(entries[start + i].enabled ? font : disabledFont);
-               usedFont->DrawString(entries[start + i].title, dest, position + labelOffset, charsPerEntry);
+               usedFont->DrawString(entries[start + i].title, dest, position + textOffset, charsPerEntry);
+
+               textOffset += geometry::Vector<int>(charsPerEntry * usedFont->CharWidth(), 0);
+
+               if (charsPerAdditionalText) {
+                       textOffset += geometry::Vector<int>(additionalTextGap, 0);
+                       if (entries[start + i].additionalText) {
+                               usedFont->DrawString(entries[start + i].additionalText, dest, position + textOffset, charsPerAdditionalText);
+                       }
+                       textOffset += geometry::Vector<int>(charsPerAdditionalText * usedFont->CharWidth(), 0);
+               }
 
                if (charsPerNumber) {
-                       geometry::Vector<int> delimiterOffset(labelOffset.X() + charsPerEntry * usedFont->CharWidth(), labelOffset.Y());
-                       usedFont->DrawChar(delimiter, dest, position + delimiterOffset);
-                       geometry::Vector<int> numberOffset(delimiterOffset.X() + usedFont->CharWidth(), delimiterOffset.Y());
-                       usedFont->DrawNumber(entries[start + i].number, dest, position + numberOffset);
+                       usedFont->DrawChar(delimiter, dest, position + textOffset);
+                       textOffset += geometry::Vector<int>(usedFont->CharWidth(), 0);
+                       usedFont->DrawNumber(entries[start + i].number, dest, position + textOffset);
                }
        }
        geometry::Vector<int> cursorOffset(