ash/Anemone3DS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update browser to not use combos

Browse Source
This commit is contained in:
Alex Taber
2024-05-12 21:51:13 -04:00
parent eae7a2250e
commit 20f3c503ad
4 changed files with 42 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/draw.h
View File

@@ -177,7 +177,7 @@ void draw_text_center(gfxScreen_t target, float y, float z, float scaleX, float
void draw_home(u64 start_time, u64 cur_time); void draw_home(u64 start_time, u64 cur_time);
void draw_base_interface(void); void draw_base_interface(void);
void draw_grid_interface(Entry_List_s * list, Instructions_s instructions); void draw_grid_interface(Entry_List_s * list, Instructions_s instructions, int extra_mode);
void draw_interface(Entry_List_s * list, Instructions_s instructions, DrawMode draw_mode); void draw_interface(Entry_List_s * list, Instructions_s instructions, DrawMode draw_mode);
#endif #endif

7
source/draw.c
View File

@@ -514,7 +514,7 @@ static void draw_entry_info(Entry_s * entry)
draw_text_wrap(20, 70, 0.5, 0.5, 0.5, colors[COLOR_WHITE], description, 363); draw_text_wrap(20, 70, 0.5, 0.5, 0.5, colors[COLOR_WHITE], description, 363);
} }
void draw_grid_interface(Entry_List_s * list, Instructions_s instructions) void draw_grid_interface(Entry_List_s * list, Instructions_s instructions, int extra_mode)
{ {
draw_base_interface(); draw_base_interface();
EntryMode current_mode = list->mode; EntryMode current_mode = list->mode;
@@ -584,6 +584,11 @@ void draw_grid_interface(Entry_List_s * list, Instructions_s instructions)
C2D_DrawRectSolid(horizontal_offset+list->entry_size-border_width, vertical_offset, 0.5f, border_width, list->entry_size, colors[COLOR_CURSOR]); C2D_DrawRectSolid(horizontal_offset+list->entry_size-border_width, vertical_offset, 0.5f, border_width, list->entry_size, colors[COLOR_CURSOR]);
} }
} }
if (extra_mode)
{
C2D_DrawRectSolid(0, 24, 0.6f, 320, 240-48, C2D_Color32(0, 0, 0, 128));
}
char entries_count_str[0x20] = {0}; char entries_count_str[0x20] = {0};
sprintf(entries_count_str, "/%" JSON_INTEGER_FORMAT, list->tp_page_count); sprintf(entries_count_str, "/%" JSON_INTEGER_FORMAT, list->tp_page_count);

53
source/remote.c
View File

@@ -494,7 +494,7 @@ bool themeplaza_browser(EntryMode mode)
Instructions_s instructions = language.remote_instructions[mode]; Instructions_s instructions = language.remote_instructions[mode];
if (extra_mode) if (extra_mode)
instructions = language.remote_extra_instructions; instructions = language.remote_extra_instructions;
draw_grid_interface(current_list, instructions); draw_grid_interface(current_list, instructions, extra_mode);
} }
if (home_displayed) if (home_displayed)
@@ -520,33 +520,36 @@ bool themeplaza_browser(EntryMode mode)
if (extra_mode) if (extra_mode)
{ {
if (kUp & KEY_X) if (kDown & KEY_B)
extra_mode = false;
if (!extra_mode)
{ {
if ((kDown | kHeld) & KEY_DLEFT) extra_mode = false;
{ }
change_mode: else if (kDown & KEY_DLEFT)
mode++; {
mode %= MODE_AMOUNT; extra_mode = false;
change_mode:
mode++;
mode %= MODE_AMOUNT;
free(current_list->tp_search); free(current_list->tp_search);
current_list->tp_search = strdup(""); current_list->tp_search = strdup("");
load_remote_list(current_list, 1, mode, false); load_remote_list(current_list, 1, mode, false);
} }
else if ((kDown | kHeld) & KEY_DUP) else if (kDown & KEY_DUP)
{ {
jump_menu(current_list); extra_mode = false;
} jump_menu(current_list);
else if ((kDown | kHeld) & KEY_DRIGHT) }
{ else if (kDown & KEY_DRIGHT)
load_remote_list(current_list, current_list->tp_current_page, mode, true); {
} extra_mode = false;
else if ((kDown | kHeld) & KEY_DDOWN) load_remote_list(current_list, current_list->tp_current_page, mode, true);
{ }
search_menu(current_list); else if (kDown & KEY_DDOWN)
} {
extra_mode = false;
search_menu(current_list);
} }
continue; continue;
} }

14
source/ui_strings.c
View File

@@ -286,7 +286,7 @@ const Language_s language_english = {
"\uE001 Go back" "\uE001 Go back"
}, },
{ {
"\uE002 Hold for more", "\uE002 More options",
"\uE003 Preview theme" "\uE003 Preview theme"
}, },
{ {
@@ -307,7 +307,7 @@ const Language_s language_english = {
"\uE001 Go back" "\uE001 Go back"
}, },
{ {
"\uE002 Hold for more", "\uE002 More options",
"\uE003 Preview splash" "\uE003 Preview splash"
}, },
{ {
@@ -323,7 +323,7 @@ const Language_s language_english = {
}, },
.remote_extra_instructions = .remote_extra_instructions =
{ {
.info_line = "Release \uE002 to cancel or hold \uE006 and release \uE002 to do stuff", .info_line = "\uE001 Leave extra menu",
.instructions = { .instructions = {
{ {
"\uE079 Jump to page", "\uE079 Jump to page",
@@ -542,7 +542,7 @@ const Language_s language_french = {
.download_bgm = "Téléchargement de la musique,\nveuillez patienter...", .download_bgm = "Téléchargement de la musique,\nveuillez patienter...",
.dump_single = "Extraction du thème installé,\nveuillez patienter...", .dump_single = "Extraction du thème installé,\nveuillez patienter...",
.dump_all_official = "Extraction des thèmes officiels,\nveuillez patienter...", .dump_all_official = "Extraction des thèmes officiels,\nveuillez patienter...",
.shuffle = "Shuffle: %i/10", .shuffle = "Aléatoire: %i/10",
}, },
.fs = .fs =
{ {
@@ -618,7 +618,7 @@ const Language_s language_french = {
"\uE001 Retour" "\uE001 Retour"
}, },
{ {
"\uE002 Maintenir pour +", "\uE002 Plus d'options",
"\uE003 Aperçu" "\uE003 Aperçu"
}, },
{ {
@@ -639,7 +639,7 @@ const Language_s language_french = {
"\uE001 Retour" "\uE001 Retour"
}, },
{ {
"\uE002 Maintenir pour +", "\uE002 Plus d'options",
"\uE003 Aperçu" "\uE003 Aperçu"
}, },
{ {
@@ -655,7 +655,7 @@ const Language_s language_french = {
}, },
.remote_extra_instructions = .remote_extra_instructions =
{ {
.info_line = "Relâcher \uE002: annuler. Maintenir \uE006 et relâcher \uE002: choisir", .info_line = "\uE001 Retour",
.instructions = { .instructions = {
{ {
"\uE079 Aller à la page", "\uE079 Aller à la page",