From 9e84e92a87ea9dfc8d446e710e394389f6d7594a Mon Sep 17 00:00:00 2001 From: VanGorkum Date: Fri, 29 Dec 2023 00:05:07 +0100 Subject: [PATCH] Repositioned code to draw orange rectangle in landing menu --- src/menu/landing_menu.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/menu/landing_menu.c b/src/menu/landing_menu.c index 27aa716..4e8e517 100644 --- a/src/menu/landing_menu.c +++ b/src/menu/landing_menu.c @@ -157,19 +157,17 @@ void landingMenuRender(struct LandingMenu* landingMenu, struct RenderState* rend } } + gSPDisplayList(renderState->dl++, ui_material_list[ORANGE_TRANSPARENT_OVERLAY_INDEX]); + gDPFillRectangle(renderState->dl++, + landingMenu->optionText[landingMenu->selectedItem]->x - paddingDepthX, + landingMenu->optionText[landingMenu->selectedItem]->y - paddingDepthY, + landingMenu->optionText[landingMenu->selectedItem]->x + maxTextWidth + paddingDepthX, + landingMenu->optionText[landingMenu->selectedItem]->y + getCurrentStrideValue(landingMenu) - paddingDepthY); + gSPDisplayList(renderState->dl++, ui_material_revert_list[ORANGE_TRANSPARENT_OVERLAY_INDEX]); + struct PrerenderedTextBatch* batch = prerenderedBatchStart(); for (int i = 0; i < landingMenu->optionCount; ++i) { prerenderedBatchAdd(batch, landingMenu->optionText[i], &gColorWhite); - - if (landingMenu->selectedItem == i ){ - gSPDisplayList(renderState->dl++, ui_material_list[ORANGE_TRANSPARENT_OVERLAY_INDEX]); - gDPFillRectangle(renderState->dl++, - landingMenu->optionText[i]->x - paddingDepthX, - landingMenu->optionText[i]->y - paddingDepthY, - landingMenu->optionText[i]->x + maxTextWidth + paddingDepthX, - landingMenu->optionText[i]->y + getCurrentStrideValue(landingMenu) - paddingDepthY); - gSPDisplayList(renderState->dl++, ui_material_revert_list[ORANGE_TRANSPARENT_OVERLAY_INDEX]); - } } renderState->dl = prerenderedBatchFinish(batch, gDejaVuSansImages, renderState->dl); gSPDisplayList(renderState->dl++, ui_material_revert_list[DEJAVU_SANS_0_INDEX]);