added wrap options for menu properties

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

diff --git a/src/graphics/Menu.h b/src/graphics/Menu.h
index f1a6d2580e25e6657a222e038eca393793c8a0ad..188c574b341b834e8c6fad6101fd1b85cfa8b6d8 100644 (file)
--- a/src/graphics/Menu.h
+++ b/src/graphics/Menu.h
@@ -9,6 +9,7 @@
 #define GRAPHICS_MENU_H_
 
 #include "Font.h"
+#include "fwd.h"
 #include "Sprite.h"
 #include "../geometry/Vector.h"
 
@@ -17,15 +18,45 @@
 
 namespace graphics {
 
-class Sprite;
+struct MenuProperties {
+       static const int TYPE_ID = 407;
+
+       const Font *font;
+       const Font *disabledFont;
+       const Sprite *cursor;
+       int charsPerEntry;
+       int rows;
+       int rowGap;
+       int iconSpace;
+       int cols;
+       int colGap;
+       int charsPerNumber;
+       int charsPerAdditionalText;
+       int additionalTextGap;
+       char delimiter;
+       bool wrapX;
+       bool wrapY;
+
+       MenuProperties()
+       : font(0), disabledFont(0), cursor(0)
+       , charsPerEntry(0), rows(0), rowGap(0)
+       , iconSpace(0), cols(0), colGap(0)
+       , charsPerNumber(0), charsPerAdditionalText(0)
+       , additionalTextGap(0), delimiter(':')
+       , wrapX(false), wrapY(false) { }
+
+       static void CreateTypeDescription();
+       static void Construct(void *);
+
+};
 
-// TODO: animation when top row changes
 template<class T>
-class Menu {
+class Menu
+: private MenuProperties {
 
 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 = ':', int charsPerAdditionalText = 0, int additionalTextGap = 0);
+       Menu(const MenuProperties &);
 
 public:
        int Width() const;
@@ -76,63 +107,26 @@ private:
                T value;
                bool enabled;
        };
-       const Font *font;
-       const Font *disabledFont;
-       const Sprite *cursor;
        std::vector<Entry> entries;
-       int charsPerEntry;
-       int rows;
-       int rowGap;
-       int iconSpace;
-       int cols;
-       int colGap;
        int selected;
        int topRow;
-       int charsPerNumber;
-       int charsPerAdditionalText;
-       int additionalTextGap;
-       char delimiter;
 
 };
 
 
 template<class T>
 Menu<T>::Menu()
-: font(0)
-, disabledFont(0)
-, cursor(0)
-, charsPerEntry(0)
-, rows(0)
-, rowGap(0)
-, iconSpace(0)
-, cols(0)
-, colGap(0)
+: MenuProperties()
 , selected(0)
-, topRow(0)
-, charsPerNumber(0)
-, charsPerAdditionalText(0)
-, additionalTextGap(0)
-, delimiter(':') {
+, topRow(0) {
 
 }
 
 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, int charsPerAdditionalText, int additionalTextGap)
-: font(font)
-, disabledFont(disabledFont ? disabledFont : font)
-, cursor(cursor)
-, charsPerEntry(charsPerEntry)
-, rows(rows)
-, rowGap(rowGap)
-, iconSpace(iconSpace)
-, cols(cols)
-, colGap(colGap)
+Menu<T>::Menu(const MenuProperties &p)
+: MenuProperties(p)
 , selected(0)
-, topRow(0)
-, charsPerNumber(charsPerNumber)
-, charsPerAdditionalText(charsPerAdditionalText)
-, additionalTextGap(additionalTextGap)
-, delimiter(delimiter) {
+, topRow(0) {
 
 }
 
@@ -163,22 +157,38 @@ int Menu<T>::Height() const {
 
 template<class T>
 void Menu<T>::NextItem() {
-       SelectIndex(selected + 1);
+       int index(selected + 1);
+       if (wrapX && index % cols == 0) {
+               index -= cols;
+       }
+       SelectIndex(index);
 }
 
 template<class T>
 void Menu<T>::PreviousItem() {
-       SelectIndex(selected - 1);
+       int index(selected - 1);
+       if (wrapX && selected % cols == 0) {
+               index += cols;
+       }
+       SelectIndex(index);
 }
 
 template<class T>
 void Menu<T>::NextRow() {
-       SelectIndex(selected + cols);
+       int index(selected + cols);
+       if (wrapY && index >= int(entries.size())) {
+               index -= entries.size();
+       }
+       SelectIndex(index);
 }
 
 template<class T>
 void Menu<T>::PreviousRow() {
-       SelectIndex(selected - cols);
+       int index(selected - cols);
+       if (wrapY && index < 0) {
+               index += entries.size();
+       }
+       SelectIndex(index);
 }
 
 template<class T>