diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index b27649f8dd..bb3beda057 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -1621,13 +1621,13 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_THREADED, MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_VFILTER, "Deflicker") MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_HEIGHT, - "Custom Viewport Height") + "Custom Aspect Ratio Height") MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH, - "Custom Viewport Width") + "Custom Aspect Ratio Width") MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_X, - "Custom Viewport X Pos.") + "Custom Aspect Ratio X Pos.") MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_Y, - "Custom Viewport Y Pos.") + "Custom Aspect Ratio Y Pos.") MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_VI_WIDTH, "Set VI Screen Width") MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_VSYNC, @@ -2417,3 +2417,15 @@ MSG_HASH(MENU_ENUM_SUBLABEL_SYSTEM_INFORMATION, "Show information specific to the device.") MSG_HASH(MENU_ENUM_SUBLABEL_QUIT_RETROARCH, "Quit the program.") +MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_WINDOW_WIDTH, + "Lets you set custom width size for the display window. Leaving it at 0 will attempt to scale the window as large as possible.") +MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_WINDOW_HEIGHT, + "Lets you set custom height size for the display window. Leaving it at 0 will attempt to scale the window as large as possible.") +MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_MESSAGE_POS_X, + "Specify custom X axis position for onscreen text.") +MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_MESSAGE_POS_Y, + "Specify custom Y axis position for onscreen text.") +MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_FONT_SIZE, + "Specify the font size in points.") +MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_OVERLAY_HIDE_IN_MENU, + "Hide the overlay while we are inside the menu, and show it again when exiting the menu.") diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index 3124f1276c..8da19df59f 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -134,8 +134,12 @@ default_sublabel_macro(action_bind_sublabel_content_list, MENU_ default_sublabel_macro(action_bind_sublabel_network_information, MENU_ENUM_SUBLABEL_NETWORK_INFORMATION) default_sublabel_macro(action_bind_sublabel_system_information, MENU_ENUM_SUBLABEL_SYSTEM_INFORMATION) default_sublabel_macro(action_bind_sublabel_quit_retroarch, MENU_ENUM_SUBLABEL_QUIT_RETROARCH) - -/* MENU_ENUM_LABEL_CONNECT_NETPLAY_ROOM*/ +default_sublabel_macro(action_bind_sublabel_video_window_width, MENU_ENUM_SUBLABEL_VIDEO_WINDOW_WIDTH) +default_sublabel_macro(action_bind_sublabel_video_window_height, MENU_ENUM_SUBLABEL_VIDEO_WINDOW_HEIGHT) +default_sublabel_macro(action_bind_sublabel_video_message_pos_x, MENU_ENUM_SUBLABEL_VIDEO_MESSAGE_POS_X) +default_sublabel_macro(action_bind_sublabel_video_message_pos_y, MENU_ENUM_SUBLABEL_VIDEO_MESSAGE_POS_Y) +default_sublabel_macro(action_bind_sublabel_video_font_size, MENU_ENUM_SUBLABEL_VIDEO_FONT_SIZE) +default_sublabel_macro(action_bind_sublabel_input_overlay_hide_in_menu, MENU_ENUM_SUBLABEL_INPUT_OVERLAY_HIDE_IN_MENU) static int action_bind_sublabel_cheevos_entry( file_list_t *list, @@ -197,6 +201,24 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, { switch (cbs->enum_idx) { + case MENU_ENUM_LABEL_INPUT_OVERLAY_HIDE_IN_MENU: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_overlay_hide_in_menu); + break; + case MENU_ENUM_LABEL_VIDEO_FONT_SIZE: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_font_size); + break; + case MENU_ENUM_LABEL_VIDEO_MESSAGE_POS_X: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_message_pos_x); + break; + case MENU_ENUM_LABEL_VIDEO_MESSAGE_POS_Y: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_message_pos_y); + break; + case MENU_ENUM_LABEL_VIDEO_WINDOW_WIDTH: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_window_width); + break; + case MENU_ENUM_LABEL_VIDEO_WINDOW_HEIGHT: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_window_height); + break; case MENU_ENUM_LABEL_QUIT_RETROARCH: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_quit_retroarch); break; diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index cc16783f49..d89b2c6d7a 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -4522,9 +4522,11 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_INPUT_OVERLAY_ENABLE, PARSE_ONLY_BOOL, false); +#if 0 menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_OVERLAY_AUTOLOAD_PREFERRED, PARSE_ONLY_BOOL, false); +#endif menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_INPUT_OVERLAY_HIDE_IN_MENU, PARSE_ONLY_BOOL, false);