thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2026-04-22 01:52:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

render R button prompt in pause menu behind mods

Browse source
This commit is contained in:
Isaac0-dev 2025-02-11 07:58:45 +10:00
parent 6150b2722f
commit 2526109484
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/pc/djui/djui.c
View file

@ -28,6 +28,7 @@ bool gDjuiInPlayerMenu = false;
bool gDjuiDisabled = false;
bool gDjuiShuttingDown = false;
static bool sDjuiInited = false;
static struct DjuiRoot* sDjuiRootBehind = NULL;
bool sDjuiRendered60fps = false;
@ -79,13 +80,13 @@ void patch_djui_interpolated(UNUSED f32 delta) {
void djui_init(void) {
gDjuiRoot = djui_root_create();
sDjuiRootBehind = djui_root_create();
gDjuiPauseOptions = djui_text_create(&gDjuiRoot->base, DLANG(MISC, R_BUTTON));
gDjuiPauseOptions = djui_text_create(&sDjuiRootBehind->base, DLANG(MISC, R_BUTTON));
djui_base_set_size_type(&gDjuiPauseOptions->base, DJUI_SVT_RELATIVE, DJUI_SVT_ABSOLUTE);
djui_base_set_size(&gDjuiPauseOptions->base, 1.0f, 32);
djui_base_set_location(&gDjuiPauseOptions->base, 0, 16);
djui_text_set_alignment(gDjuiPauseOptions, DJUI_HALIGN_CENTER, DJUI_VALIGN_CENTER);
djui_base_set_visible(&gDjuiPauseOptions->base, false);
sDjuiLuaError = djui_text_create(&gDjuiRoot->base, "");
djui_base_set_size_type(&sDjuiLuaError->base, DJUI_SVT_RELATIVE, DJUI_SVT_ABSOLUTE);
@ -157,12 +158,15 @@ void djui_render(void) {
create_dl_ortho_matrix();
djui_gfx_displaylist_begin();
if (sDjuiRootBehind != NULL && (sCurrPlayMode == PLAY_MODE_PAUSED) && !gDjuiPanelPauseCreated) {
djui_base_render(&sDjuiRootBehind->base);
}
smlua_call_event_on_hud_render(djui_reset_hud_params);
djui_panel_update();
djui_popup_update();
djui_base_set_visible(&gDjuiPauseOptions->base, (sCurrPlayMode == PLAY_MODE_PAUSED) && !gDjuiPanelPauseCreated);
if (gDjuiRoot != NULL) {
djui_base_render(&gDjuiRoot->base);
}

4
src/pc/djui/djui_fps_display.c
View file

@ -32,8 +32,8 @@ void djui_fps_display_create(void) {
struct DjuiBase* base = &fpsDisplay->base;
djui_base_init(NULL, base, NULL, djui_fps_display_on_destroy);
djui_base_set_size(base, 150, 50);
djui_base_set_color(base, 0, 0, 0, 240);
djui_base_set_border_color(base, 0, 0, 0, 200);
djui_base_set_color(base, 0, 0, 0, 200);
djui_base_set_border_color(base, 0, 0, 0, 160);
djui_base_set_border_width(base, 4);
djui_base_set_padding(base, 16, 16, 16, 16);