From eae7a2250e294baf70d1efbeadda84ce34a10b24 Mon Sep 17 00:00:00 2001 From: Alex Taber Date: Sun, 12 May 2024 20:01:09 -0400 Subject: [PATCH] Fix no themes/splashes buttons --- source/draw.c | 8 +++----- source/main.c | 36 +++++++++++++++++++++++++++++++++++- 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/source/draw.c b/source/draw.c index 372dc5b..1cc3336 100644 --- a/source/draw.c +++ b/source/draw.c @@ -641,11 +641,9 @@ void draw_interface(Entry_List_s * list, Instructions_s instructions, DrawMode d set_screen(bottom); - draw_image(sprites_sort_idx, 320-144, 0); - draw_image(sprites_qr_idx, 320-120, 0); - draw_image(sprites_browse_idx, 320-96, 0); - draw_image(sprites_exit_idx, 320-72, 0); - draw_image(sprites_preview_idx, 320-48, 0); + draw_image(sprites_qr_idx, 320-96, 0); + draw_image(sprites_browse_idx, 320-72, 0); + draw_image(sprites_exit_idx, 320-48, 0); draw_text(320-24+2.5, -3, 0.6, 1.0f, 0.9f, colors[COLOR_WHITE], mode_switch_char[!current_mode]); diff --git a/source/main.c b/source/main.c index fcc6dde..cfe1553 100644 --- a/source/main.c +++ b/source/main.c @@ -488,7 +488,41 @@ int main(void) if(kDown & KEY_START) quit = true; - if(!install_mode && !extra_mode) + if(current_list->entries_count == 0) + { + if (kDown & KEY_R) + { + goto enable_qr; + } else if (kDown & KEY_L) + { + goto switch_mode; + } else if (kDown & KEY_TOUCH) + { + touchPosition touch = {0}; + hidTouchRead(&touch); + + u16 x = touch.px; + u16 y = touch.py; + if (y < 24) + { + if(BETWEEN(320-24, x, 320)) + { + goto switch_mode; + } else if(BETWEEN(320-48, x, 320-24)) + { + quit = true; + continue; + } else if(BETWEEN(320-72, x, 320-48)) + { + goto browse_themeplaza; + } else if(BETWEEN(320-96, x, 320-72)) + { + goto enable_qr; + } + } + } + } + else if(!install_mode && !extra_mode) { if(!preview_mode && kDown & KEY_L) //toggle between splashes and themes {