Add RGUI Border Filler Enable

This commit is contained in:
twinaphex 2018-04-24 16:01:51 +02:00
parent 68c9cf4cb9
commit ee421fcaa8
24 changed files with 86 additions and 16 deletions

View File

@ -1331,6 +1331,9 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,
#ifdef HAVE_MATERIALUI
SETTING_BOOL("materialui_icons_enable", &settings->bools.menu_materialui_icons_enable, true, materialui_icons_enable, false);
#endif
#ifdef HAVE_RGUI
SETTING_BOOL("rgui_border_filler_enable", &settings->bools.menu_rgui_border_filler_enable, true, true, false);
#endif
#ifdef HAVE_XMB
SETTING_BOOL("xmb_shadows_enable", &settings->bools.menu_xmb_shadows_enable, true, xmb_shadows_enable, false);
SETTING_BOOL("xmb_vertical_thumbnails", &settings->bools.menu_xmb_vertical_thumbnails, true, xmb_vertical_thumbnails, false);

View File

@ -148,6 +148,7 @@ typedef struct settings
bool menu_show_quit_retroarch;
bool menu_show_reboot;
bool menu_materialui_icons_enable;
bool menu_rgui_border_filler_enable;
bool menu_xmb_shadows_enable;
bool menu_xmb_vertical_thumbnails;
bool menu_content_show_settings;

View File

@ -3435,3 +3435,5 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_STATISTICS_SHOW,
"Display Statistics")
MSG_HASH(MENU_ENUM_SUBLABEL_STATISTICS_SHOW,
"Show onscreen technical statistics.")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_RGUI_BORDER_FILLER_ENABLE,
"Enable border filler")

View File

@ -3221,3 +3221,5 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_STATISTICS_SHOW,
"Display Statistics")
MSG_HASH(MENU_ENUM_SUBLABEL_STATISTICS_SHOW,
"Show onscreen technical statistics.")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_RGUI_BORDER_FILLER_ENABLE,
"Enable border filler")

View File

@ -3213,3 +3213,5 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_STATISTICS_SHOW,
"Display Statistics")
MSG_HASH(MENU_ENUM_SUBLABEL_STATISTICS_SHOW,
"Show onscreen technical statistics.")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_RGUI_BORDER_FILLER_ENABLE,
"Enable border filler")

View File

@ -3327,3 +3327,5 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_STATISTICS_SHOW,
"Display Statistics")
MSG_HASH(MENU_ENUM_SUBLABEL_STATISTICS_SHOW,
"Show onscreen technical statistics.")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_RGUI_BORDER_FILLER_ENABLE,
"Enable border filler")

View File

@ -3086,3 +3086,5 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_STATISTICS_SHOW,
"Display Statistics")
MSG_HASH(MENU_ENUM_SUBLABEL_STATISTICS_SHOW,
"Show onscreen technical statistics.")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_RGUI_BORDER_FILLER_ENABLE,
"Enable border filler")

View File

@ -5817,3 +5817,5 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_STATISTICS_SHOW,
"Display Statistics")
MSG_HASH(MENU_ENUM_SUBLABEL_STATISTICS_SHOW,
"Show onscreen technical statistics.")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_RGUI_BORDER_FILLER_ENABLE,
"Enable border filler")

View File

@ -3251,3 +3251,5 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_STATISTICS_SHOW,
"Display Statistics")
MSG_HASH(MENU_ENUM_SUBLABEL_STATISTICS_SHOW,
"Show onscreen technical statistics.")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_RGUI_BORDER_FILLER_ENABLE,
"Enable border filler")

View File

@ -3309,3 +3309,5 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_STATISTICS_SHOW,
"Mostra statistiche")
MSG_HASH(MENU_ENUM_SUBLABEL_STATISTICS_SHOW,
"Mostra statistiche tecniche su schermo.")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_RGUI_BORDER_FILLER_ENABLE,
"Enable border filler")

View File

@ -3325,3 +3325,5 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_STATISTICS_SHOW,
"Display Statistics")
MSG_HASH(MENU_ENUM_SUBLABEL_STATISTICS_SHOW,
"Show onscreen technical statistics.")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_RGUI_BORDER_FILLER_ENABLE,
"Enable border filler")

View File

@ -3212,3 +3212,5 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_STATISTICS_SHOW,
"Display Statistics")
MSG_HASH(MENU_ENUM_SUBLABEL_STATISTICS_SHOW,
"Show onscreen technical statistics.")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_RGUI_BORDER_FILLER_ENABLE,
"Enable border filler")

View File

@ -1473,3 +1473,5 @@ MSG_HASH(MENU_ENUM_LABEL_INPUT_DRIVER_LINUXRAW,
"linuxraw")
MSG_HASH(MENU_ENUM_LABEL_VIDEO_WINDOW_SHOW_DECORATIONS,
"video_window_show_decorations")
MSG_HASH(MENU_ENUM_LABEL_MENU_RGUI_BORDER_FILLER_ENABLE,
"menu_rgui_border_filler_enable")

View File

@ -3088,3 +3088,5 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_STATISTICS_SHOW,
"Display Statistics")
MSG_HASH(MENU_ENUM_SUBLABEL_STATISTICS_SHOW,
"Show onscreen technical statistics.")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_RGUI_BORDER_FILLER_ENABLE,
"Enable border filler")

View File

@ -3447,3 +3447,5 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_STATISTICS_SHOW,
"Wyświetl statystyki")
MSG_HASH(MENU_ENUM_SUBLABEL_STATISTICS_SHOW,
"Pokaż techniczne statystyki na ekranie.")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_RGUI_BORDER_FILLER_ENABLE,
"Enable border filler")

View File

@ -4316,3 +4316,5 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_STATISTICS_SHOW,
"Exibir estatísticas")
MSG_HASH(MENU_ENUM_SUBLABEL_STATISTICS_SHOW,
"Mostrar estatísticas técnicas na tela.")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_RGUI_BORDER_FILLER_ENABLE,
"Enable border filler")

View File

@ -3186,3 +3186,5 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_STATISTICS_SHOW,
"Display Statistics")
MSG_HASH(MENU_ENUM_SUBLABEL_STATISTICS_SHOW,
"Show onscreen technical statistics.")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_RGUI_BORDER_FILLER_ENABLE,
"Enable border filler")

View File

@ -3270,3 +3270,5 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_STATISTICS_SHOW,
"Display Statistics")
MSG_HASH(MENU_ENUM_SUBLABEL_STATISTICS_SHOW,
"Show onscreen technical statistics.")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_RGUI_BORDER_FILLER_ENABLE,
"Enable border filler")

View File

@ -3491,3 +3491,5 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_STATISTICS_SHOW,
"Display Statistics")
MSG_HASH(MENU_ENUM_SUBLABEL_STATISTICS_SHOW,
"Show onscreen technical statistics.")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_RGUI_BORDER_FILLER_ENABLE,
"Enable border filler")

View File

@ -3243,3 +3243,5 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_STATISTICS_SHOW,
"Display Statistics")
MSG_HASH(MENU_ENUM_SUBLABEL_STATISTICS_SHOW,
"Show onscreen technical statistics.")
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_RGUI_BORDER_FILLER_ENABLE,
"Enable border filler")

View File

@ -263,12 +263,17 @@ static void rgui_render_background(void)
if (rgui_framebuf_data)
{
rgui_fill_rect(rgui_framebuf_data, fb_pitch, 5, 5, fb_width - 10, 5, rgui_green_filler);
rgui_fill_rect(rgui_framebuf_data, fb_pitch, 5, fb_height - 10, fb_width - 10, 5, rgui_green_filler);
settings_t *settings = config_get_ptr();
rgui_fill_rect(rgui_framebuf_data, fb_pitch, 5, 5, 5, fb_height - 10, rgui_green_filler);
rgui_fill_rect(rgui_framebuf_data, fb_pitch, fb_width - 10, 5, 5, fb_height - 10,
rgui_green_filler);
if (settings->bools.menu_rgui_border_filler_enable)
{
rgui_fill_rect(rgui_framebuf_data, fb_pitch, 5, 5, fb_width - 10, 5, rgui_green_filler);
rgui_fill_rect(rgui_framebuf_data, fb_pitch, 5, fb_height - 10, fb_width - 10, 5, rgui_green_filler);
rgui_fill_rect(rgui_framebuf_data, fb_pitch, 5, 5, 5, fb_height - 10, rgui_green_filler);
rgui_fill_rect(rgui_framebuf_data, fb_pitch, fb_width - 10, 5, 5, fb_height - 10,
rgui_green_filler);
}
}
}
@ -341,17 +346,21 @@ static void rgui_render_messagebox(const char *message)
rgui_fill_rect(rgui_framebuf_data,
fb_pitch, x + 5, y + 5, width - 10,
height - 10, rgui_gray_filler);
rgui_fill_rect(rgui_framebuf_data,
fb_pitch, x, y, width - 5, 5, rgui_green_filler);
rgui_fill_rect(rgui_framebuf_data,
fb_pitch, x + width - 5, y, 5,
height - 5, rgui_green_filler);
rgui_fill_rect(rgui_framebuf_data,
fb_pitch, x + 5, y + height - 5,
width - 5, 5, rgui_green_filler);
rgui_fill_rect(rgui_framebuf_data,
fb_pitch, x, y + 5, 5,
height - 5, rgui_green_filler);
if (settings->bools.menu_rgui_border_filler_enable)
{
rgui_fill_rect(rgui_framebuf_data,
fb_pitch, x, y, width - 5, 5, rgui_green_filler);
rgui_fill_rect(rgui_framebuf_data,
fb_pitch, x + width - 5, y, 5,
height - 5, rgui_green_filler);
rgui_fill_rect(rgui_framebuf_data,
fb_pitch, x + 5, y + height - 5,
width - 5, 5, rgui_green_filler);
rgui_fill_rect(rgui_framebuf_data,
fb_pitch, x, y + 5, 5,
height - 5, rgui_green_filler);
}
}
color = NORMAL_COLOR(settings);

View File

@ -5306,6 +5306,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
MENU_ENUM_LABEL_MENU_FRAMEBUFFER_OPACITY,
PARSE_ONLY_FLOAT, false) == 0)
count++;
if (menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_MENU_RGUI_BORDER_FILLER_ENABLE,
PARSE_ONLY_BOOL, false) == 0)
count++;
if (menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_MENU_LINEAR_FILTER,
PARSE_ONLY_BOOL, false) == 0)

View File

@ -5181,6 +5181,22 @@ static bool setting_append_list(
if (BIT32_GET(flags.flags, GFX_CTX_FLAGS_MENU_FRAME_FILTERING))
setting_set = true;
CONFIG_BOOL(
list, list_info,
&settings->bools.menu_rgui_border_filler_enable,
MENU_ENUM_LABEL_MENU_RGUI_BORDER_FILLER_ENABLE,
MENU_ENUM_LABEL_VALUE_MENU_RGUI_BORDER_FILLER_ENABLE,
true,
MENU_ENUM_LABEL_VALUE_OFF,
MENU_ENUM_LABEL_VALUE_ON,
&group_info,
&subgroup_info,
parent_group,
general_write_handler,
general_read_handler,
SD_FLAG_ADVANCED
);
if (setting_set)
CONFIG_BOOL(
list, list_info,

View File

@ -748,6 +748,7 @@ enum msg_hash_enums
MENU_LABEL(PAUSE_NONACTIVE),
MENU_LABEL(MOUSE_ENABLE),
MENU_LABEL(POINTER_ENABLE),
MENU_LABEL(MENU_RGUI_BORDER_FILLER_ENABLE),
MENU_LABEL(MENU_LINEAR_FILTER),
MENU_LABEL(MENU_HORIZONTAL_ANIMATION),
MENU_LABEL(NAVIGATION_WRAPAROUND),