The-Homebrew-Cloud/WiiUPluginLoaderBackend
2
0
Fork 0
mirror of https://github.com/wiiu-env/WiiUPluginLoaderBackend.git synced 2024-11-22 04:39:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve config menu navigation

Browse Source
This commit is contained in:
Maschell 2023-01-05 21:01:30 +01:00
parent a039901388
commit 43ddb8f1dd
1 changed files with 49 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
source/utils/ConfigUtils.cpp
View File

@ -144,9 +144,11 @@ void ConfigUtils::displayMenu() {
ConfigDisplayItem *currentConfig = nullptr; ConfigDisplayItem *currentConfig = nullptr;
WUPSConfigCategory *currentCategory = nullptr; WUPSConfigCategory *currentCategory = nullptr;
uint32_t selectedBtn = 0; uint32_t selectedConfig = 0;
uint32_t start = 0; uint32_t selectedCat = 0;
uint32_t end = MAX_BUTTONS_ON_SCREEN; uint32_t selectedItem = 0;
uint32_t start = 0;
uint32_t end = MAX_BUTTONS_ON_SCREEN;
if (configs.size() < MAX_BUTTONS_ON_SCREEN) { if (configs.size() < MAX_BUTTONS_ON_SCREEN) {
end = configs.size(); end = configs.size();
} }
@ -198,25 +200,27 @@ void ConfigUtils::displayMenu() {
if (!currentConfig || !currentConfig->config) { if (!currentConfig || !currentConfig->config) {
if (buttonsTriggered & VPAD_BUTTON_DOWN) { if (buttonsTriggered & VPAD_BUTTON_DOWN) {
if (selectedBtn < configs.size() - 1) { if (selectedConfig < configs.size() - 1) {
selectedBtn++; selectedCat = 0;
selectedConfig++;
redraw = true; redraw = true;
} }
} else if (buttonsTriggered & VPAD_BUTTON_UP) { } else if (buttonsTriggered & VPAD_BUTTON_UP) {
if (selectedBtn > 0) { if (selectedConfig > 0) {
selectedBtn--; selectedCat = 0;
selectedConfig--;
redraw = true; redraw = true;
} }
} }
if (buttonsTriggered & VPAD_BUTTON_A) { if (buttonsTriggered & VPAD_BUTTON_A) {
currentConfig = &configs[selectedBtn]; currentConfig = &configs[selectedConfig];
if (currentConfig == nullptr) { if (currentConfig == nullptr) {
break; break;
} }
selectedBtn = 0; selectedItem = 0;
start = 0; start = 0;
end = MAX_BUTTONS_ON_SCREEN; end = MAX_BUTTONS_ON_SCREEN;
auto cats = currentConfig->config->getCategories(); auto cats = currentConfig->config->getCategories();
if (cats.size() < MAX_BUTTONS_ON_SCREEN) { if (cats.size() < MAX_BUTTONS_ON_SCREEN) {
@ -227,11 +231,11 @@ void ConfigUtils::displayMenu() {
continue; continue;
} }
if (selectedBtn >= end) { if (selectedConfig >= end) {
end = selectedBtn + 1; end = selectedConfig + 1;
start = end - MAX_BUTTONS_ON_SCREEN; start = end - MAX_BUTTONS_ON_SCREEN;
} else if (selectedBtn < start) { } else if (selectedConfig < start) {
start = selectedBtn; start = selectedConfig;
end = start + MAX_BUTTONS_ON_SCREEN; end = start + MAX_BUTTONS_ON_SCREEN;
} }
@ -244,7 +248,7 @@ void ConfigUtils::displayMenu() {
for (uint32_t i = start; i < end; i++) { for (uint32_t i = start; i < end; i++) {
DrawUtils::setFontColor(COLOR_TEXT); DrawUtils::setFontColor(COLOR_TEXT);
if (i == selectedBtn) { if (i == selectedConfig) {
DrawUtils::drawRect(16, index, SCREEN_WIDTH - 16 * 2, 44, 4, COLOR_BORDER_HIGHLIGHTED); DrawUtils::drawRect(16, index, SCREEN_WIDTH - 16 * 2, 44, 4, COLOR_BORDER_HIGHLIGHTED);
} else { } else {
DrawUtils::drawRect(16, index, SCREEN_WIDTH - 16 * 2, 44, 2, COLOR_BORDER); DrawUtils::drawRect(16, index, SCREEN_WIDTH - 16 * 2, 44, 2, COLOR_BORDER);
@ -299,23 +303,25 @@ void ConfigUtils::displayMenu() {
if (!currentCategory) { if (!currentCategory) {
auto cats = currentConfig->config->getCategories(); auto cats = currentConfig->config->getCategories();
if (buttonsTriggered & VPAD_BUTTON_DOWN) { if (buttonsTriggered & VPAD_BUTTON_DOWN) {
if (selectedBtn < cats.size() - 1) { if (selectedCat < cats.size() - 1) {
selectedBtn++; selectedCat++;
redraw = true; redraw = true;
} }
} else if (buttonsTriggered & VPAD_BUTTON_UP) { } else if (buttonsTriggered & VPAD_BUTTON_UP) {
if (selectedBtn > 0) { if (selectedCat > 0) {
selectedBtn--; selectedCat--;
redraw = true; redraw = true;
} }
} else if (buttonsTriggered & VPAD_BUTTON_A) { } else if (buttonsTriggered & VPAD_BUTTON_A) {
currentCategory = cats[selectedBtn]; if (!cats.empty() && selectedCat > cats.size() - 1) {
selectedCat = 0;
}
currentCategory = cats[selectedCat];
if (currentCategory == nullptr) { if (currentCategory == nullptr) {
DEBUG_FUNCTION_LINE_ERR("currentCategory was NULL"); DEBUG_FUNCTION_LINE_ERR("currentCategory was NULL");
break; break;
} }
selectedBtn = 0;
start = 0; start = 0;
end = MAX_BUTTONS_ON_SCREEN; end = MAX_BUTTONS_ON_SCREEN;
prevSelectedItem = -1; prevSelectedItem = -1;
@ -330,7 +336,6 @@ void ConfigUtils::displayMenu() {
} else if (buttonsTriggered & VPAD_BUTTON_B) { } else if (buttonsTriggered & VPAD_BUTTON_B) {
currentConfig = nullptr; currentConfig = nullptr;
currentCategory = nullptr; currentCategory = nullptr;
selectedBtn = 0;
start = 0; start = 0;
end = MAX_BUTTONS_ON_SCREEN; end = MAX_BUTTONS_ON_SCREEN;
if (configs.size() < MAX_BUTTONS_ON_SCREEN) { if (configs.size() < MAX_BUTTONS_ON_SCREEN) {
@ -340,11 +345,11 @@ void ConfigUtils::displayMenu() {
continue; continue;
} }
if (selectedBtn >= end) { if (selectedCat >= end) {
end = selectedBtn + 1; end = selectedCat + 1;
start = end - MAX_BUTTONS_ON_SCREEN; start = end - MAX_BUTTONS_ON_SCREEN;
} else if (selectedBtn < start) { } else if (selectedCat < start) {
start = selectedBtn; start = selectedCat;
end = start + MAX_BUTTONS_ON_SCREEN; end = start + MAX_BUTTONS_ON_SCREEN;
} }
@ -357,7 +362,7 @@ void ConfigUtils::displayMenu() {
for (uint32_t i = start; i < end; i++) { for (uint32_t i = start; i < end; i++) {
DrawUtils::setFontColor(COLOR_TEXT); DrawUtils::setFontColor(COLOR_TEXT);
if (i == selectedBtn) { if (i == selectedCat) {
DrawUtils::drawRect(16, index, SCREEN_WIDTH - 16 * 2, 44, 4, COLOR_BORDER_HIGHLIGHTED); DrawUtils::drawRect(16, index, SCREEN_WIDTH - 16 * 2, 44, 4, COLOR_BORDER_HIGHLIGHTED);
} else { } else {
DrawUtils::drawRect(16, index, SCREEN_WIDTH - 16 * 2, 44, 2, COLOR_BORDER); DrawUtils::drawRect(16, index, SCREEN_WIDTH - 16 * 2, 44, 2, COLOR_BORDER);
@ -408,18 +413,17 @@ void ConfigUtils::displayMenu() {
if (isItemMovementAllowed) { if (isItemMovementAllowed) {
if (buttonsTriggered & VPAD_BUTTON_DOWN) { if (buttonsTriggered & VPAD_BUTTON_DOWN) {
if (selectedBtn < config_items.size() - 1) { if (selectedItem < config_items.size() - 1) {
selectedBtn++; selectedItem++;
redraw = true; redraw = true;
} }
} else if (buttonsTriggered & VPAD_BUTTON_UP) { } else if (buttonsTriggered & VPAD_BUTTON_UP) {
if (selectedBtn > 0) { if (selectedItem > 0) {
selectedBtn--; selectedItem--;
redraw = true; redraw = true;
} }
} else if (buttonsTriggered & VPAD_BUTTON_B) { } else if (buttonsTriggered & VPAD_BUTTON_B) {
currentCategory = nullptr; currentCategory = nullptr;
selectedBtn = 0;
start = 0; start = 0;
end = MAX_BUTTONS_ON_SCREEN; end = MAX_BUTTONS_ON_SCREEN;
auto catSize = currentConfig->config->getCategories().size(); auto catSize = currentConfig->config->getCategories().size();
@ -488,25 +492,25 @@ void ConfigUtils::displayMenu() {
redraw = true; redraw = true;
} }
if (selectedBtn >= end) { if (selectedItem >= end) {
end = selectedBtn + 1; end = selectedItem + 1;
start = end - MAX_BUTTONS_ON_SCREEN; start = selectedItem - MAX_BUTTONS_ON_SCREEN;
} else if (selectedBtn < start) { } else if (selectedItem < start) {
start = selectedBtn; start = selectedItem;
end = start + MAX_BUTTONS_ON_SCREEN; end = start + MAX_BUTTONS_ON_SCREEN;
} }
if (redraw) { if (redraw) {
if (prevSelectedItem != (int32_t) selectedBtn) { if (prevSelectedItem != (int32_t) selectedItem) {
if (prevSelectedItem >= 0) { if (prevSelectedItem >= 0) {
config_items[prevSelectedItem]->onSelected(false); config_items[prevSelectedItem]->onSelected(false);
} }
config_items[selectedBtn]->onSelected(true); config_items[selectedItem]->onSelected(true);
prevSelectedItem = (int32_t) selectedBtn; prevSelectedItem = (int32_t) selectedItem;
} }
if (pressedButtons != WUPS_CONFIG_BUTTON_NONE) { if (pressedButtons != WUPS_CONFIG_BUTTON_NONE) {
config_items[selectedBtn]->onButtonPressed(pressedButtons); config_items[selectedItem]->onButtonPressed(pressedButtons);
} }
DrawUtils::beginDraw(); DrawUtils::beginDraw();
@ -517,7 +521,7 @@ void ConfigUtils::displayMenu() {
for (uint32_t i = start; i < end; i++) { for (uint32_t i = start; i < end; i++) {
DrawUtils::setFontColor(COLOR_TEXT); DrawUtils::setFontColor(COLOR_TEXT);
if (i == selectedBtn) { if (i == selectedItem) {
DrawUtils::drawRect(16, index, SCREEN_WIDTH - 16 * 2, 44, 4, COLOR_BORDER_HIGHLIGHTED); DrawUtils::drawRect(16, index, SCREEN_WIDTH - 16 * 2, 44, 4, COLOR_BORDER_HIGHLIGHTED);
} else { } else {
DrawUtils::drawRect(16, index, SCREEN_WIDTH - 16 * 2, 44, 2, COLOR_BORDER); DrawUtils::drawRect(16, index, SCREEN_WIDTH - 16 * 2, 44, 2, COLOR_BORDER);
@ -525,7 +529,7 @@ void ConfigUtils::displayMenu() {
DrawUtils::setFontSize(24); DrawUtils::setFontSize(24);
DrawUtils::print(16 * 2, index + 8 + 24, config_items[i]->getDisplayName().c_str()); DrawUtils::print(16 * 2, index + 8 + 24, config_items[i]->getDisplayName().c_str());
if (i == selectedBtn) { if (i == selectedItem) {
DrawUtils::print(SCREEN_WIDTH - 16 * 2, index + 8 + 24, config_items[i]->getCurrentValueSelectedDisplay().c_str(), true); DrawUtils::print(SCREEN_WIDTH - 16 * 2, index + 8 + 24, config_items[i]->getCurrentValueSelectedDisplay().c_str(), true);
} else { } else {
DrawUtils::print(SCREEN_WIDTH - 16 * 2, index + 8 + 24, config_items[i]->getCurrentValueDisplay().c_str(), true); DrawUtils::print(SCREEN_WIDTH - 16 * 2, index + 8 + 24, config_items[i]->getCurrentValueDisplay().c_str(), true);
@ -565,7 +569,7 @@ void ConfigUtils::displayMenu() {
DrawUtils::endDraw(); DrawUtils::endDraw();
redraw = pressedButtons != WUPS_CONFIG_BUTTON_NONE; redraw = pressedButtons != WUPS_CONFIG_BUTTON_NONE;
isItemMovementAllowed = config_items[selectedBtn]->isMovementAllowed(); isItemMovementAllowed = config_items[selectedItem]->isMovementAllowed();
} }
} }