mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Settingsmenu: Create submenus for each category

pull/5270/merge
obligaron 3 years ago committed by Anders Jenbo
parent
0c4015869c
commit
7a1f962e33
1 changed files with 79 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 111
      Source/DiabloUI/settingsmenu.cpp

111
Source/DiabloUI/settingsmenu.cpp
Unescape View File

@ -28,9 +28,11 @@ bool backToMain = false;
std::vector<std::unique_ptr<UiListItem>> vecDialogItems;
std::vector<std::unique_ptr<UiItemBase>> vecDialog;
std::vector<OptionEntryBase *> vecOptions;
OptionCategoryBase *selectedCategory = nullptr;
OptionEntryBase *selectedOption = nullptr;
enum class ShownMenuType : uint8_t {
Categories,
Settings,
ListOption,
KeyInput,
@ -96,8 +98,17 @@ void CleanUpSettingsUI()
void GoBackOneMenuLevel()
{
endMenu = true;
backToMain = shownMenu == ShownMenuType::Settings;
shownMenu = ShownMenuType::Settings;
switch (shownMenu) {
case ShownMenuType::Categories:
backToMain = true;
break;
case ShownMenuType::Settings:
shownMenu = ShownMenuType::Categories;
break;
default:
shownMenu = ShownMenuType::Settings;
break;
}
}
void StartPadEntryTimer()
@ -141,18 +152,32 @@ void UpdateDescription(const OptionEntryBase &option)
CopyUtf8(optionDescription, paragraphs, sizeof(optionDescription));
}
void ItemFocused(int value)
void UpdateDescription(const OptionCategoryBase &category)
{
if (shownMenu != ShownMenuType::Settings)
return;
auto paragraphs = WordWrapString(category.GetDescription(), rectDescription.size.width, GameFont12, 1);
CopyUtf8(optionDescription, paragraphs, sizeof(optionDescription));
}
auto &vecItem = vecDialogItems[value];
optionDescription[0] = '\0';
if (vecItem->m_value < 0 || shownMenu != ShownMenuType::Settings) {
return;
void ItemFocused(int value)
{
switch (shownMenu) {
case ShownMenuType::Categories: {
auto &vecItem = vecDialogItems[value];
optionDescription[0] = '\0';
if (vecItem->m_value < 0)
return;
auto *pCategory = sgOptions.GetCategories()[vecItem->m_value];
UpdateDescription(*pCategory);
} break;
case ShownMenuType::Settings: {
auto &vecItem = vecDialogItems[value];
optionDescription[0] = '\0';
if (vecItem->m_value < 0)
return;
auto *pOption = vecOptions[vecItem->m_value];
UpdateDescription(*pOption);
} break;
}
auto *pOption = vecOptions[vecItem->m_value];
UpdateDescription(*pOption);
}
bool ChangeOptionValue(OptionEntryBase *pOption, size_t listIndex)
@ -223,6 +248,11 @@ void ItemSelected(int value)
}
switch (shownMenu) {
case ShownMenuType::Categories: {
selectedCategory = sgOptions.GetCategories()[vecItemValue];
endMenu = true;
shownMenu = ShownMenuType::Settings;
} break;
case ShownMenuType::Settings: {
auto *pOption = vecOptions[vecItemValue];
bool updateValueDescription = false;
@ -306,7 +336,8 @@ void FullscreenChanged()
void UiSettingsMenu()
{
backToMain = false;
shownMenu = ShownMenuType::Settings;
shownMenu = ShownMenuType::Categories;
selectedCategory = nullptr;
selectedOption = nullptr;
do {
@ -326,40 +357,56 @@ void UiSettingsMenu()
optionDescription[0] = '\0';
string_view titleText = shownMenu == ShownMenuType::Settings ? _("Settings") : selectedOption->GetName();
string_view titleText;
switch (shownMenu) {
case ShownMenuType::Categories:
titleText = _("Settings");
break;
case ShownMenuType::Settings:
titleText = selectedCategory->GetName();
break;
default:
titleText = selectedOption->GetName();
break;
}
vecDialog.push_back(std::make_unique<UiArtText>(titleText.data(), MakeSdlRect(uiRectangle.position.x, uiRectangle.position.y + 161, uiRectangle.size.width, 35), UiFlags::FontSize30 | UiFlags::ColorUiSilver | UiFlags::AlignCenter, 8));
vecDialog.push_back(std::make_unique<UiScrollbar>((*ArtScrollBarBackground)[0], (*ArtScrollBarThumb)[0], *ArtScrollBarArrow, MakeSdlRect(rectList.position.x + rectList.size.width + 5, rectList.position.y, 25, rectList.size.height)));
vecDialog.push_back(std::make_unique<UiArtText>(optionDescription, MakeSdlRect(rectDescription), UiFlags::FontSize12 | UiFlags::ColorUiSilverDark | UiFlags::AlignCenter, 1, descriptionLineHeight));
size_t itemToSelect = 1;
size_t itemToSelect = 0;
std::optional<tl::function_ref<bool(SDL_Event &)>> eventHandler;
switch (shownMenu) {
case ShownMenuType::Settings: {
case ShownMenuType::Categories: {
size_t catCount = 0;
size_t catIndex = 0;
for (auto *pCategory : sgOptions.GetCategories()) {
bool categoryCreated = false;
for (auto *pEntry : pCategory->GetEntries()) {
if (!IsValidEntry(pEntry))
continue;
if (!categoryCreated) {
if (catCount > 0)
vecDialogItems.push_back(std::make_unique<UiListItem>("", static_cast<int>(SpecialMenuEntry::None), UiFlags::ElementDisabled));
catCount += 1;
vecDialogItems.push_back(std::make_unique<UiListItem>(pCategory->GetName(), static_cast<int>(SpecialMenuEntry::None), UiFlags::ColorWhitegold | UiFlags::ElementDisabled));
categoryCreated = true;
}
if (selectedOption == pEntry)
if (selectedCategory == pCategory)
itemToSelect = vecDialogItems.size();
auto formatArgs = CreateDrawStringFormatArgForEntry(pEntry);
if (NeedsTwoLinesToDisplayOption(formatArgs)) {
vecDialogItems.push_back(std::make_unique<UiListItem>("{}:", formatArgs, vecOptions.size(), UiFlags::ColorUiGold | UiFlags::NeedsNextElement));
vecDialogItems.push_back(std::make_unique<UiListItem>(pEntry->GetValueDescription(), vecOptions.size(), UiFlags::ColorUiSilver | UiFlags::ElementDisabled));
} else {
vecDialogItems.push_back(std::make_unique<UiListItem>("{}: {}", formatArgs, vecOptions.size(), UiFlags::ColorUiGold));
}
vecOptions.push_back(pEntry);
catCount += 1;
vecDialogItems.push_back(std::make_unique<UiListItem>(pCategory->GetName(), static_cast<int>(catIndex), UiFlags::ColorUiGold));
break;
}
catIndex++;
}
} break;
case ShownMenuType::Settings: {
for (auto *pEntry : selectedCategory->GetEntries()) {
if (!IsValidEntry(pEntry))
continue;
if (selectedOption == pEntry)
itemToSelect = vecDialogItems.size();
auto formatArgs = CreateDrawStringFormatArgForEntry(pEntry);
if (NeedsTwoLinesToDisplayOption(formatArgs)) {
vecDialogItems.push_back(std::make_unique<UiListItem>("{}:", formatArgs, vecOptions.size(), UiFlags::ColorUiGold | UiFlags::NeedsNextElement));
vecDialogItems.push_back(std::make_unique<UiListItem>(pEntry->GetValueDescription(), vecOptions.size(), UiFlags::ColorUiSilver | UiFlags::ElementDisabled));
} else {
vecDialogItems.push_back(std::make_unique<UiListItem>("{}: {}", formatArgs, vecOptions.size(), UiFlags::ColorUiGold));
}
vecOptions.push_back(pEntry);
}
} break;
case ShownMenuType::ListOption: {

Write Preview
Loading…
Cancel
Save