ApfelTeeSaft/vanilla
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/vanilla.git synced 2026-08-26 19:33:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

gui: in main menu, create console buttons first

Browse Source 
Fixes #295
This commit is contained in:
itsmattkc
2025-12-30 02:07:06 -08:00
parent 969db197fd
commit a7d9c626f2
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gui/menu/menu_main.c
+11 -9
View File
@@ -120,7 +120,7 @@ void vpi_menu_main_connect_button_action(vui_context_t *vui, int btn, void *v)
void vpi_menu_main_edit_button_action(vui_context_t *vui, int btn, void *v)
{
int layer = (intptr_t) v;
int console = -1;
for (int i = 0; i < MAIN_MENU_ENTRIES; i++) {
@@ -155,6 +155,14 @@ void vpi_menu_main(vui_context_t *vui, void *v)
int layer = vui_layer_create(vui);
console_menu_layer = vui_layer_create(vui);
// Console list (generate this first so the first connected console is the default option)
int list_item_width = SCREEN_WIDTH - BTN_SZ - BTN_SZ;
int list_item_height = (SCREEN_HEIGHT - BTN_SZ - BTN_SZ) / MAIN_MENU_ENTRIES;
for (int i = 0; i < MAIN_MENU_ENTRIES; i++) {
main_menu_btns[i] = vui_button_create(vui, BTN_SZ, BTN_SZ + list_item_height * i, list_item_width, list_item_height, NULL, NULL, VUI_BUTTON_STYLE_LIST, console_menu_layer, vpi_menu_main_connect_console, (void *) (intptr_t) i);
vui_button_update_checkable(vui, main_menu_btns[i], 1);
}
// Left arrow
main_menu_left_arrow_btn = vui_button_create(vui, 0, arrow_y, BTN_SZ, BTN_SZ, "<", NULL, VUI_BUTTON_STYLE_BUTTON, layer, vpi_menu_main_left_arrow, (void *) (intptr_t) console_menu_layer);
@@ -175,13 +183,7 @@ void vpi_menu_main(vui_context_t *vui, void *v)
// No entries text
main_menu_no_console_lbl = vui_label_create(vui, 0, SCREEN_HEIGHT * 2 / 5, SCREEN_WIDTH, SCREEN_HEIGHT, lang(VPI_LANG_NO_CONSOLES_SYNCED), vui_color_create(0,0,0,0.5f), VUI_FONT_SIZE_SMALL, layer);
// Console list
int list_item_width = SCREEN_WIDTH - BTN_SZ - BTN_SZ;
int list_item_height = (SCREEN_HEIGHT - BTN_SZ - BTN_SZ) / MAIN_MENU_ENTRIES;
for (int i = 0; i < MAIN_MENU_ENTRIES; i++) {
main_menu_btns[i] = vui_button_create(vui, BTN_SZ, BTN_SZ + list_item_height * i, list_item_width, list_item_height, NULL, NULL, VUI_BUTTON_STYLE_LIST, console_menu_layer, vpi_menu_main_connect_console, (void *) (intptr_t) i);
vui_button_update_checkable(vui, main_menu_btns[i], 1);
}
// Update state of all buttons
vpi_menu_main_populate(vui);
if (!v) {
@@ -189,4 +191,4 @@ void vpi_menu_main(vui_context_t *vui, void *v)
} else {
vui_transition_fade_layer_in(vui, layer, NULL, NULL);
}
}
}