amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-11 05:07:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed sub menus

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@94 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2006-11-25 01:36:43 +00:00
parent 563afde7a3
commit 9a62445621
4 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/value/choice.cpp
+6 -4
View File
@@ -35,6 +35,8 @@ ChoiceField::ChoiceP DropDownChoiceList::getChoice(size_t item) const {
String DropDownChoiceList::itemText(size_t item) const {
if (isFieldDefault(item)) {
return field().default_name;
} else if (isGroupDefault(item)) {
return group->default_name;
} else {
ChoiceField::ChoiceP choice = getChoice(item);
return choice->name;
@@ -43,15 +45,15 @@ String DropDownChoiceList::itemText(size_t item) const {
bool DropDownChoiceList::lineBelow(size_t item) const {
return isDefault(item);
}
DropDownList* DropDownChoiceList::submenu(size_t item) {
DropDownList* DropDownChoiceList::submenu(size_t item) const {
if (isDefault(item)) return nullptr;
item -= hasDefault();
if (item < submenus.size()) submenus.resize(item + 1);
if (item >= submenus.size()) submenus.resize(item + 1);
if (submenus[item]) return submenus[item].get();
ChoiceField::ChoiceP choice = getChoice(item);
ChoiceField::ChoiceP choice = group->choices[item];
if (choice->isGroup()) {
// create submenu
submenus[item].reset(new DropDownChoiceList(GetParent(), true, cve, choice));
submenus[item].reset(new DropDownChoiceList(const_cast<DropDownChoiceList*>(this), true, cve, choice));
}
return submenus[item].get();
}
src/gui/value/choice.hpp
+2 -2
View File
@@ -50,7 +50,7 @@ class DropDownChoiceList : public DropDownList {
virtual bool lineBelow(size_t item) const;
virtual String itemText(size_t item) const;
virtual void drawIcon(DC& dc, int x, int y, size_t item, bool selected) const;
virtual DropDownList* submenu(size_t item);
virtual DropDownList* submenu(size_t item) const;
virtual void select(size_t item);
virtual size_t selection() const;
@@ -58,7 +58,7 @@ class DropDownChoiceList : public DropDownList {
private:
ChoiceValueEditor& cve;
ChoiceField::ChoiceP group; ///< Group this menu shows
vector<DropDownListP> submenus;
mutable vector<DropDownListP> submenus;
inline const ChoiceField& field() const { return cve.field(); }