From 64d6a6db8194f6c9a0897195218ee00af8a5b524 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 12 Jun 2015 16:11:50 +0200 Subject: [PATCH] (RGUI) Cleanups --- menu/drivers/rgui.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c index cd0ecc83d9..e73bcb55de 100644 --- a/menu/drivers/rgui.c +++ b/menu/drivers/rgui.c @@ -442,11 +442,13 @@ static void rgui_render(void) for (; i < end; i++, y += FONT_HEIGHT_STRIDE) { - char entry_path[PATH_MAX_LENGTH], entry_value[PATH_MAX_LENGTH]; - char message[PATH_MAX_LENGTH], - entry_title_buf[PATH_MAX_LENGTH], type_str_buf[PATH_MAX_LENGTH]; - unsigned entry_spacing = menu_entry_get_spacing(i); - bool entry_selected = menu_entry_is_currently_selected(i); + char entry_path[PATH_MAX_LENGTH] = {0}; + char entry_value[PATH_MAX_LENGTH] = {0}; + char message[PATH_MAX_LENGTH] = {0}; + char entry_title_buf[PATH_MAX_LENGTH] = {0}; + char type_str_buf[PATH_MAX_LENGTH] = {0}; + unsigned entry_spacing = menu_entry_get_spacing(i); + bool entry_selected = menu_entry_is_currently_selected(i); if (i > (menu->navigation.selection_ptr + 100)) continue; @@ -586,6 +588,7 @@ static void rgui_navigation_clear(bool pending_push) static void rgui_navigation_set(bool scroll) { menu_handle_t *menu = menu_driver_get_ptr(); + menu_navigation_t *nav = menu_navigation_get_ptr(); if (!menu) return; size_t end = menu_entries_get_end(); @@ -593,12 +596,12 @@ static void rgui_navigation_set(bool scroll) if (!scroll) return; - if (menu->navigation.selection_ptr < RGUI_TERM_HEIGHT/2) + if (nav->selection_ptr < RGUI_TERM_HEIGHT/2) menu->begin = 0; - else if (menu->navigation.selection_ptr >= RGUI_TERM_HEIGHT/2 - && menu->navigation.selection_ptr < (end - RGUI_TERM_HEIGHT/2)) - menu->begin = menu->navigation.selection_ptr - RGUI_TERM_HEIGHT/2; - else if (menu->navigation.selection_ptr >= (end - RGUI_TERM_HEIGHT/2)) + else if (nav->selection_ptr >= RGUI_TERM_HEIGHT/2 + && nav->selection_ptr < (end - RGUI_TERM_HEIGHT/2)) + menu->begin = nav->selection_ptr - RGUI_TERM_HEIGHT/2; + else if (nav->selection_ptr >= (end - RGUI_TERM_HEIGHT/2)) menu->begin = end - RGUI_TERM_HEIGHT; }