Used option text properties for x and y coordinates

This commit is contained in:
VanGorkum 2023-12-28 18:40:08 +01:00
parent 6da067113e
commit 3c5b8c9e7c

View file

@ -147,8 +147,6 @@ void landingMenuRender(struct LandingMenu* landingMenu, struct RenderState* rend
int paddingDepthY = 2; int paddingDepthY = 2;
int paddingDepthX = 4; int paddingDepthX = 4;
int highlightWidth = 160; int highlightWidth = 160;
int landingMenuTextY = LANDING_MENU_TEXT_START_Y;
int stride = getCurrentStrideValue(landingMenu);
if (landingMenu->optionCount > PACKED_MENU_THRESHOLD){ if (landingMenu->optionCount > PACKED_MENU_THRESHOLD){
paddingDepthY = 0; paddingDepthY = 0;
highlightWidth = 185; highlightWidth = 185;
@ -161,13 +159,12 @@ void landingMenuRender(struct LandingMenu* landingMenu, struct RenderState* rend
if (landingMenu->selectedItem == i ){ if (landingMenu->selectedItem == i ){
gSPDisplayList(renderState->dl++, ui_material_list[ORANGE_TRANSPARENT_OVERLAY_INDEX]); gSPDisplayList(renderState->dl++, ui_material_list[ORANGE_TRANSPARENT_OVERLAY_INDEX]);
gDPFillRectangle(renderState->dl++, gDPFillRectangle(renderState->dl++,
LANDING_MENU_TEXT_START_X - paddingDepthX, landingMenu->optionText[i]->x - paddingDepthX,
landingMenuTextY - paddingDepthY, landingMenu->optionText[i]->y - paddingDepthY,
highlightWidth + paddingDepthX, highlightWidth + paddingDepthX,
landingMenuTextY + stride - paddingDepthY); landingMenu->optionText[i]->y + getCurrentStrideValue(landingMenu) - paddingDepthY);
gSPDisplayList(renderState->dl++, ui_material_revert_list[ORANGE_TRANSPARENT_OVERLAY_INDEX]); gSPDisplayList(renderState->dl++, ui_material_revert_list[ORANGE_TRANSPARENT_OVERLAY_INDEX]);
} }
landingMenuTextY += stride;
} }
renderState->dl = prerenderedBatchFinish(batch, gDejaVuSansImages, renderState->dl); renderState->dl = prerenderedBatchFinish(batch, gDejaVuSansImages, renderState->dl);
gSPDisplayList(renderState->dl++, ui_material_revert_list[DEJAVU_SANS_0_INDEX]); gSPDisplayList(renderState->dl++, ui_material_revert_list[DEJAVU_SANS_0_INDEX]);