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 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)
int items(entries.size() - start);
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(