libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-27 18:20:27 +00:00
Code Issues Actions 44 Packages Projects Releases Wiki Activity

Less settings pointer grabbing

Browse Source
This commit is contained in:
twinaphex 2017-01-20 15:38:20 +01:00
parent 0be6264796
commit 927e4b6be0
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gfx/video_driver.c
View File

@ -2283,6 +2283,9 @@ void video_driver_build_info(video_frame_info_t *video_info)
video_info->libretro_running = false;
#ifdef HAVE_MENU
video_info->menu_footer_opacity = settings->menu.footer.opacity;
video_info->menu_header_opacity = settings->menu.header.opacity;
video_info->materialui_color_theme = settings->menu.materialui.menu_color_theme;
video_info->menu_shader_pipeline = settings->menu.xmb.shader_pipeline;
video_info->xmb_theme = settings->menu.xmb.theme;
video_info->xmb_color_theme = settings->menu.xmb.menu_color_theme;
@ -2296,6 +2299,9 @@ void video_driver_build_info(video_frame_info_t *video_info)
video_info->libretro_running = (rarch_ctl(RARCH_CTL_IS_INITED, NULL)
&& !rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL));
#else
video_info->menu_footer_opacity = 0.0f;
video_info->menu_header_opacity = 0.0f;
video_info->materialui_color_theme = 0;
video_info->menu_shader_pipeline = 0;
video_info->xmb_color_theme = 0;
video_info->xmb_theme = 0;

5
gfx/video_driver.h
View File

@ -115,12 +115,17 @@ typedef struct video_frame_info
bool use_rgba;
bool libretro_running;
float menu_header_opacity;
float menu_footer_opacity;
bool xmb_shadows_enable;
float xmb_alpha_factor;
unsigned xmb_theme;
unsigned xmb_color_theme;
unsigned menu_shader_pipeline;
unsigned materialui_color_theme;
bool battery_level_enable;
bool timedate_enable;
} video_frame_info_t;

7
menu/drivers/materialui.c
View File

@ -1038,7 +1038,6 @@ static void mui_frame(void *data, video_frame_info_t *video_info)
size_t title_margin = 0;
mui_handle_t *mui = (mui_handle_t*)data;
uint64_t frame_count = video_info->frame_count;
settings_t *settings = config_get_ptr();
bool background_rendered = false;
bool libretro_running = video_info->libretro_running;
@ -1059,7 +1058,7 @@ static void mui_frame(void *data, video_frame_info_t *video_info)
msg[0] = title[0] = title_buf[0] = title_msg[0] = '\0';
switch (settings->menu.materialui.menu_color_theme)
switch (video_info->materialui_color_theme)
{
case MATERIALUI_THEME_BLUE:
hex32_to_rgba_normalized(0x2196F3, blue_500, 1.00);
@ -1208,8 +1207,8 @@ static void mui_frame(void *data, video_frame_info_t *video_info)
break;
}
menu_display_set_alpha(header_bg_color_real, settings->menu.header.opacity);
menu_display_set_alpha(footer_bg_color_real, settings->menu.footer.opacity);
menu_display_set_alpha(header_bg_color_real, video_info->menu_header_opacity);
menu_display_set_alpha(footer_bg_color_real, video_info->menu_footer_opacity);
menu_display_set_viewport(video_info->width, video_info->height);
header_height = menu_display_get_header_height();