#include "../geometry/Point.h"
#include "../geometry/Vector.h"
-#include <iostream>
#include <vector>
#include <SDL.h>
public:
Menu();
- Menu(const Font *font, const Font *disabledFont, const Sprite *cursor, int charsPerEntry, int rows, int rowGap = 0, int cols = 1, int colGap = 0);
- Menu(const 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);
public:
int Width() const;
int Height() const;
- int ColWidth() const { return font->CharWidth() * charsPerEntry; }
+ int ColWidth() const { return iconSpace + font->CharWidth() * charsPerEntry; }
int RowHeight() const { return font->CharHeight() + rowGap; }
T &Selected() { return entries[selected].value; }
int charsPerEntry;
int rows;
int rowGap;
+ int iconSpace;
int cols;
int colGap;
int selected;
, charsPerEntry(0)
, rows(0)
, rowGap(0)
+, iconSpace(0)
, cols(0)
, colGap(0)
, selected(0)
}
template<class T>
-Menu<T>::Menu(const Font *font, const Font *disabledFont, const Sprite *cursor, int charsPerEntry, int rows, int rowGap, int cols, int colGap)
+Menu<T>::Menu(const Font *font, const Font *disabledFont, const Sprite *cursor, int charsPerEntry, int rows, int rowGap, int iconSpace, int cols, int colGap)
: font(font)
, disabledFont(disabledFont ? disabledFont : font)
, cursor(cursor)
, charsPerEntry(charsPerEntry)
, rows(rows)
, rowGap(rowGap)
+, iconSpace(iconSpace)
, cols(cols)
, colGap(colGap)
, selected(0)
}
-template<class T>
-Menu<T>::Menu(const Menu &other)
-: font(other.font)
-, disabledFont(other.disabledFont)
-, cursor(other.cursor)
-, entries(other.entries)
-, charsPerEntry(other.charsPerEntry)
-, rows(other.rows)
-, rowGap(other.rowGap)
-, cols(other.cols)
-, colGap(other.colGap)
-, selected(other.selected)
-, topRow(other.topRow) {
- std::cout << "copied Menu" << std::endl;
-}
-
template<class T>
int Menu<T>::Width() const {
template<class T>
void Menu<T>::SelectIndex(int index) {
- if (index < 0 || int(entries.size()) < index) return;
- std::cout << "selecting index " << index << std::endl;
+ if (index < 0 || int(entries.size()) <= index) return;
selected = index;
- if (GetRow(selected) - rows > topRow) {
- topRow = GetRow(selected) - rows;
+ if (topRow <= GetRow(selected) - rows) {
+ topRow = GetRow(selected) - rows + 1;
} else if (GetRow(selected) < topRow) {
topRow = GetRow(selected);
}
template<class T>
void Menu<T>::Draw(SDL_Surface *dest, geometry::Point<int> position) const {
int start(topRow * cols);
- int slots((topRow + rows) * cols);
+ int slots(rows * cols);
int items(entries.size() - start);
- int end(items < slots ? items : slots);
+ int end(start + (items < slots ? items : slots));
for (int i(0), count(end - start); i < count; ++i) {
- geometry::Vector<int> offset(
+ geometry::Vector<int> iconOffset(
(i % cols) * (ColWidth() + colGap),
(i / cols) * RowHeight());
+ if (entries[start + i].icon) {
+ entries[start + i].icon->Draw(dest, position + iconOffset);
+ }
+ geometry::Vector<int> labelOffset(iconOffset.X() + + iconSpace, iconOffset.Y());
if (entries[start + i].enabled) {
- font->DrawString(entries[start + i].title, dest, position + offset, charsPerEntry);
+ font->DrawString(entries[start + i].title, dest, position + labelOffset, charsPerEntry);
} else {
- disabledFont->DrawString(entries[start + i].title, dest, position + offset, charsPerEntry);
+ disabledFont->DrawString(entries[start + i].title, dest, position + labelOffset, charsPerEntry);
}
}
geometry::Vector<int> cursorOffset(
(selected % cols) * (ColWidth() + colGap) - cursor->Width(),
- (selected / cols) * RowHeight());
+ ((selected - start) / cols) * RowHeight());
cursor->Draw(dest, position + cursorOffset);
}