From a33280b08e24f145c214ae5f8908113edabdb0a5 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 21 Dec 2019 07:00:27 +0100 Subject: [PATCH] (Menu) Implement touch/OK callbacks --- menu/menu_displaylist.c | 36 +++++++++++++------------ menu/menu_setting.c | 58 +++++++++++++++++++++++++---------------- 2 files changed, 56 insertions(+), 38 deletions(-) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index f12a2991b3..32bd664e37 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -6069,19 +6069,19 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct settings_t *settings = config_get_ptr(); menu_displaylist_build_info_selective_t build_list[] = { {MENU_ENUM_LABEL_VIDEO_FONT_ENABLE, PARSE_ONLY_BOOL, true }, - {MENU_ENUM_LABEL_FPS_SHOW, PARSE_ONLY_BOOL, true }, + {MENU_ENUM_LABEL_FPS_SHOW, PARSE_ONLY_BOOL, false }, {MENU_ENUM_LABEL_FPS_UPDATE_INTERVAL, PARSE_ONLY_UINT, false }, - {MENU_ENUM_LABEL_FRAMECOUNT_SHOW, PARSE_ONLY_BOOL, true }, - {MENU_ENUM_LABEL_STATISTICS_SHOW, PARSE_ONLY_BOOL, true }, - {MENU_ENUM_LABEL_MEMORY_SHOW, PARSE_ONLY_BOOL, true }, - {MENU_ENUM_LABEL_VIDEO_FONT_PATH, PARSE_ONLY_PATH, true }, - {MENU_ENUM_LABEL_VIDEO_FONT_SIZE, PARSE_ONLY_FLOAT, true}, - {MENU_ENUM_LABEL_VIDEO_MESSAGE_POS_X, PARSE_ONLY_FLOAT, true}, - {MENU_ENUM_LABEL_VIDEO_MESSAGE_POS_Y, PARSE_ONLY_FLOAT, true}, - {MENU_ENUM_LABEL_VIDEO_MESSAGE_COLOR_RED, PARSE_ONLY_FLOAT, true}, - {MENU_ENUM_LABEL_VIDEO_MESSAGE_COLOR_GREEN, PARSE_ONLY_FLOAT, true}, - {MENU_ENUM_LABEL_VIDEO_MESSAGE_COLOR_BLUE, PARSE_ONLY_FLOAT, true}, - {MENU_ENUM_LABEL_VIDEO_MESSAGE_BGCOLOR_ENABLE, PARSE_ONLY_BOOL, true}, + {MENU_ENUM_LABEL_FRAMECOUNT_SHOW, PARSE_ONLY_BOOL, false }, + {MENU_ENUM_LABEL_STATISTICS_SHOW, PARSE_ONLY_BOOL, false }, + {MENU_ENUM_LABEL_MEMORY_SHOW, PARSE_ONLY_BOOL, false }, + {MENU_ENUM_LABEL_VIDEO_FONT_PATH, PARSE_ONLY_PATH, false }, + {MENU_ENUM_LABEL_VIDEO_FONT_SIZE, PARSE_ONLY_FLOAT, false }, + {MENU_ENUM_LABEL_VIDEO_MESSAGE_POS_X, PARSE_ONLY_FLOAT, false }, + {MENU_ENUM_LABEL_VIDEO_MESSAGE_POS_Y, PARSE_ONLY_FLOAT, false }, + {MENU_ENUM_LABEL_VIDEO_MESSAGE_COLOR_RED, PARSE_ONLY_FLOAT, false }, + {MENU_ENUM_LABEL_VIDEO_MESSAGE_COLOR_GREEN, PARSE_ONLY_FLOAT, false }, + {MENU_ENUM_LABEL_VIDEO_MESSAGE_COLOR_BLUE, PARSE_ONLY_FLOAT, false }, + {MENU_ENUM_LABEL_VIDEO_MESSAGE_BGCOLOR_ENABLE, PARSE_ONLY_BOOL, false }, {MENU_ENUM_LABEL_VIDEO_MESSAGE_BGCOLOR_RED, PARSE_ONLY_UINT, false}, {MENU_ENUM_LABEL_VIDEO_MESSAGE_BGCOLOR_GREEN, PARSE_ONLY_UINT, false}, {MENU_ENUM_LABEL_VIDEO_MESSAGE_BGCOLOR_BLUE, PARSE_ONLY_UINT, false}, @@ -6093,17 +6093,21 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct switch (build_list[i].enum_idx) { case MENU_ENUM_LABEL_FPS_UPDATE_INTERVAL: - if (settings->bools.video_fps_show) - build_list[i].checked = true; + if (settings->bools.video_font_enable) + if (settings->bools.video_fps_show) + build_list[i].checked = true; break; case MENU_ENUM_LABEL_VIDEO_MESSAGE_BGCOLOR_RED: case MENU_ENUM_LABEL_VIDEO_MESSAGE_BGCOLOR_GREEN: case MENU_ENUM_LABEL_VIDEO_MESSAGE_BGCOLOR_BLUE: case MENU_ENUM_LABEL_VIDEO_MESSAGE_BGCOLOR_OPACITY: - if (settings->bools.video_msg_bgcolor_enable) - build_list[i].checked = true; + if (settings->bools.video_font_enable) + if (settings->bools.video_msg_bgcolor_enable) + build_list[i].checked = true; break; default: + if (settings->bools.video_font_enable) + build_list[i].checked = true; break; } } diff --git a/menu/menu_setting.c b/menu/menu_setting.c index b239a76a21..362b8d5722 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -8448,8 +8448,9 @@ static bool setting_append_list( general_write_handler, general_read_handler, SD_FLAG_ADVANCED); - (*list)[list_info->index - 1].action_left = &setting_bool_action_left_with_refresh; - (*list)[list_info->index - 1].action_right = &setting_bool_action_right_with_refresh; + (*list)[list_info->index - 1].action_ok = &setting_bool_action_left_with_refresh; + (*list)[list_info->index - 1].action_left = &setting_bool_action_left_with_refresh; + (*list)[list_info->index - 1].action_right = &setting_bool_action_right_with_refresh; CONFIG_BOOL( list, list_info, @@ -8732,8 +8733,9 @@ static bool setting_append_list( general_write_handler, general_read_handler, SD_FLAG_CMD_APPLY_AUTO); - (*list)[list_info->index - 1].action_left = &setting_bool_action_left_with_refresh; - (*list)[list_info->index - 1].action_right = &setting_bool_action_right_with_refresh; + (*list)[list_info->index - 1].action_ok = &setting_bool_action_left_with_refresh; + (*list)[list_info->index - 1].action_left = &setting_bool_action_left_with_refresh; + (*list)[list_info->index - 1].action_right = &setting_bool_action_right_with_refresh; menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_REWIND_TOGGLE); CONFIG_UINT( @@ -9257,8 +9259,9 @@ static bool setting_append_list( general_write_handler, general_read_handler, SD_FLAG_NONE); - (*list)[list_info->index - 1].action_left = &setting_bool_action_left_with_refresh; - (*list)[list_info->index - 1].action_right = &setting_bool_action_right_with_refresh; + (*list)[list_info->index - 1].action_ok = &setting_bool_action_left_with_refresh; + (*list)[list_info->index - 1].action_left = &setting_bool_action_left_with_refresh; + (*list)[list_info->index - 1].action_right = &setting_bool_action_right_with_refresh; CONFIG_UINT( list, list_info, @@ -9618,8 +9621,9 @@ static bool setting_append_list( (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint; (*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_uint_aspect_ratio_index; - (*list)[list_info->index - 1].action_left = setting_uint_action_left_with_refresh; - (*list)[list_info->index - 1].action_right = setting_uint_action_right_with_refresh; + (*list)[list_info->index - 1].action_ok = setting_uint_action_left_with_refresh; + (*list)[list_info->index - 1].action_left = setting_uint_action_left_with_refresh; + (*list)[list_info->index - 1].action_right = setting_uint_action_right_with_refresh; CONFIG_FLOAT( list, list_info, @@ -9865,8 +9869,9 @@ static bool setting_append_list( general_write_handler, general_read_handler, SD_FLAG_NONE); - (*list)[list_info->index - 1].action_left = setting_bool_action_left_with_refresh; - (*list)[list_info->index - 1].action_right = setting_bool_action_right_with_refresh; + (*list)[list_info->index - 1].action_ok = setting_bool_action_left_with_refresh; + (*list)[list_info->index - 1].action_left = setting_bool_action_left_with_refresh; + (*list)[list_info->index - 1].action_right = setting_bool_action_right_with_refresh; menu_settings_list_current_add_cmd( list, list_info, @@ -10023,8 +10028,9 @@ static bool setting_append_list( general_read_handler, SD_FLAG_NONE ); - (*list)[list_info->index - 1].action_left = setting_bool_action_left_with_refresh; - (*list)[list_info->index - 1].action_right = setting_bool_action_right_with_refresh; + (*list)[list_info->index - 1].action_ok = setting_bool_action_left_with_refresh; + (*list)[list_info->index - 1].action_left = setting_bool_action_left_with_refresh; + (*list)[list_info->index - 1].action_right = setting_bool_action_right_with_refresh; CONFIG_UINT( list, list_info, @@ -10074,8 +10080,9 @@ static bool setting_append_list( general_write_handler, general_read_handler, SD_FLAG_NONE); - (*list)[list_info->index - 1].action_left = setting_bool_action_left_with_refresh; - (*list)[list_info->index - 1].action_right = setting_bool_action_right_with_refresh; + (*list)[list_info->index - 1].action_ok = setting_bool_action_left_with_refresh; + (*list)[list_info->index - 1].action_left = setting_bool_action_left_with_refresh; + (*list)[list_info->index - 1].action_right = setting_bool_action_right_with_refresh; CONFIG_UINT( list, list_info, @@ -11542,8 +11549,9 @@ static bool setting_append_list( general_read_handler, SD_FLAG_NONE ); - (*list)[list_info->index - 1].action_left = setting_bool_action_left_with_refresh; - (*list)[list_info->index - 1].action_right = setting_bool_action_right_with_refresh; + (*list)[list_info->index - 1].action_ok = setting_bool_action_left_with_refresh; + (*list)[list_info->index - 1].action_left = setting_bool_action_left_with_refresh; + (*list)[list_info->index - 1].action_right = setting_bool_action_right_with_refresh; CONFIG_UINT( list, list_info, @@ -11658,6 +11666,9 @@ static bool setting_append_list( general_read_handler, SD_FLAG_NONE ); + (*list)[list_info->index - 1].action_ok = &setting_bool_action_left_with_refresh; + (*list)[list_info->index - 1].action_left = &setting_bool_action_left_with_refresh; + (*list)[list_info->index - 1].action_right = &setting_bool_action_right_with_refresh; CONFIG_PATH( list, list_info, @@ -11784,8 +11795,9 @@ static bool setting_append_list( general_read_handler, SD_FLAG_NONE ); - (*list)[list_info->index - 1].action_left = &setting_bool_action_left_with_refresh; - (*list)[list_info->index - 1].action_right = &setting_bool_action_right_with_refresh; + (*list)[list_info->index - 1].action_ok = &setting_bool_action_left_with_refresh; + (*list)[list_info->index - 1].action_left = &setting_bool_action_left_with_refresh; + (*list)[list_info->index - 1].action_right = &setting_bool_action_right_with_refresh; CONFIG_UINT( list, list_info, @@ -11870,8 +11882,9 @@ static bool setting_append_list( general_read_handler, SD_FLAG_NONE ); - (*list)[list_info->index - 1].action_left = &setting_bool_action_left_with_refresh; - (*list)[list_info->index - 1].action_right = &setting_bool_action_right_with_refresh; + (*list)[list_info->index - 1].action_ok = &setting_bool_action_left_with_refresh; + (*list)[list_info->index - 1].action_left = &setting_bool_action_left_with_refresh; + (*list)[list_info->index - 1].action_right = &setting_bool_action_right_with_refresh; (*list)[list_info->index - 1].change_handler = overlay_enable_toggle_change_handler; CONFIG_BOOL( @@ -15189,8 +15202,9 @@ static bool setting_append_list( general_read_handler, SD_FLAG_NONE ); - (*list)[list_info->index - 1].action_left = setting_bool_action_left_with_refresh; - (*list)[list_info->index - 1].action_right = setting_bool_action_right_with_refresh; + (*list)[list_info->index - 1].action_ok = setting_bool_action_left_with_refresh; + (*list)[list_info->index - 1].action_left = setting_bool_action_left_with_refresh; + (*list)[list_info->index - 1].action_right = setting_bool_action_right_with_refresh; CONFIG_BOOL( list, list_info,