From 31bcb3d6f84b99c93844bde70251bcf3dec9ce7b Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 25 Jul 2016 14:27:51 +0200 Subject: [PATCH] (MaterialUI) Try to default to Shield color theme for Shields --- configuration.c | 7 ++++++- defaults.h | 12 ++++++++++++ frontend/drivers/platform_linux.c | 12 ++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/configuration.c b/configuration.c index 815dfa9149..2b4c55c68a 100644 --- a/configuration.c +++ b/configuration.c @@ -474,7 +474,12 @@ static void config_set_defaults(void) settings->menu.xmb.shader_pipeline = menu_shader_pipeline; settings->menu.xmb.font[0] = '\0'; #endif - settings->menu.materialui.menu_color_theme = 0; +#ifdef HAVE_MATERIALUI + settings->menu.materialui.menu_color_theme = MATERIALUI_THEME_BLUE; + + if (g_defaults.menu.materialui.menu_color_theme_enable) + settings->menu.materialui.menu_color_theme = g_defaults.menu.materialui.menu_color_theme; +#endif settings->menu.throttle_framerate = true; settings->menu.linear_filter = true; diff --git a/defaults.h b/defaults.h index 1f7dc82973..466cfb1128 100644 --- a/defaults.h +++ b/defaults.h @@ -26,6 +26,18 @@ struct defaults { + +#ifdef HAVE_MENU + struct + { + struct + { + bool menu_color_theme_enable; + unsigned menu_color_theme; + } materialui; + } menu; +#endif + struct { char core_assets[PATH_MAX_LENGTH]; diff --git a/frontend/drivers/platform_linux.c b/frontend/drivers/platform_linux.c index b0e811b93a..7fc0439bc4 100644 --- a/frontend/drivers/platform_linux.c +++ b/frontend/drivers/platform_linux.c @@ -54,6 +54,10 @@ #include "../../verbosity.h" #include "platform_linux.h" +#ifdef HAVE_MENU +#include "../../menu/menu_display.h" +#endif + #ifdef ANDROID enum { @@ -1651,7 +1655,15 @@ static void frontend_linux_get_env(int *argc, else if (strstr(device_model, "GAMEMID_BT")) g_defaults.settings.out_latency = 160; else if (strstr(device_model, "SHIELD")) + { g_defaults.settings.video_refresh_rate = 60.0; +#ifdef HAVE_MENU +#ifdef HAVE_MATERIALUI + g_defaults.menu.materialui.menu_color_theme_enable = true; + g_defaults.menu.materialui.menu_color_theme = MATERIALUI_THEME_NVIDIA_SHIELD; +#endif +#endif + } else if (strstr(device_model, "JSS15J")) g_defaults.settings.video_refresh_rate = 59.65;