diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index 69de415614..8c89191b29 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -817,6 +817,7 @@ static void mui_frame(void *data) float color_nv_header[16] = {0}; float color_nv_body[16] = {0}; float color_nv_accent[16] = {0}; + float footer_bg_color_real[16] = {0}; unsigned width = 0; unsigned height = 0; unsigned ticker_limit = 0; @@ -853,10 +854,11 @@ static void mui_frame(void *data) case MATERIALUI_THEME_BLUE: hex32_to_rgba_normalized(0x2196F3, blue_500, 1.00); hex32_to_rgba_normalized(0xE3F2FD, blue_50, 0.90); + hex32_to_rgba_normalized(0xFFFFFF, footer_bg_color_real, 1.00); header_bg_color = blue_500; highlighted_entry_color = blue_50; - footer_bg_color = white_bg; + footer_bg_color = footer_bg_color_real; body_bg_color = white_transp_bg; active_tab_marker_color = blue_500; @@ -872,11 +874,12 @@ static void mui_frame(void *data) case MATERIALUI_THEME_BLUE_GREY: hex32_to_rgba_normalized(0x607D8B, blue_grey_500, 1.00); hex32_to_rgba_normalized(0xCFD8DC, blue_grey_50, 0.90); + hex32_to_rgba_normalized(0xFFFFFF, footer_bg_color_real, 1.00); header_bg_color = blue_grey_500; body_bg_color = white_transp_bg; highlighted_entry_color = blue_grey_50; - footer_bg_color = white_bg; + footer_bg_color = footer_bg_color_real; active_tab_marker_color = blue_grey_500; font_normal_color = black_opaque_54; @@ -891,11 +894,12 @@ static void mui_frame(void *data) case MATERIALUI_THEME_GREEN: hex32_to_rgba_normalized(0x4CAF50, green_500, 1.00); hex32_to_rgba_normalized(0xC8E6C9, green_50, 0.90); + hex32_to_rgba_normalized(0xFFFFFF, footer_bg_color_real, 1.00); header_bg_color = green_500; body_bg_color = white_transp_bg; highlighted_entry_color = green_50; - footer_bg_color = white_bg; + footer_bg_color = footer_bg_color_real; active_tab_marker_color = green_500; font_normal_color = black_opaque_54; @@ -910,11 +914,12 @@ static void mui_frame(void *data) case MATERIALUI_THEME_RED: hex32_to_rgba_normalized(0xF44336, red_500, 1.00); hex32_to_rgba_normalized(0xFFEBEE, red_50, 0.90); + hex32_to_rgba_normalized(0xFFFFFF, footer_bg_color_real, 1.00); header_bg_color = red_500; body_bg_color = white_transp_bg; highlighted_entry_color = red_50; - footer_bg_color = white_bg; + footer_bg_color = footer_bg_color_real; body_bg_color = white_transp_bg; active_tab_marker_color = red_500; @@ -930,11 +935,12 @@ static void mui_frame(void *data) case MATERIALUI_THEME_YELLOW: hex32_to_rgba_normalized(0xFFEB3B, yellow_500, 1.00); hex32_to_rgba_normalized(0xFFF9C4, yellow_200, 0.90); + hex32_to_rgba_normalized(0xFFFFFF, footer_bg_color_real, 1.00); header_bg_color = yellow_500; body_bg_color = white_transp_bg; highlighted_entry_color = yellow_200; - footer_bg_color = white_bg; + footer_bg_color = footer_bg_color_real; active_tab_marker_color = yellow_500; font_normal_color = black_opaque_54; @@ -947,10 +953,11 @@ static void mui_frame(void *data) clearcolor.a = 0.75f; break; case MATERIALUI_THEME_DARK_BLUE: + hex32_to_rgba_normalized(0x212121, footer_bg_color_real, 1.00); header_bg_color = greyish_blue; body_bg_color = almost_black; highlighted_entry_color = grey_bg; - footer_bg_color = almost_black; + footer_bg_color = footer_bg_color_real; active_tab_marker_color = greyish_blue; font_normal_color = white_opaque_70; @@ -966,11 +973,12 @@ static void mui_frame(void *data) hex32_to_rgba_normalized(0x282F37, color_nv_header,1.00); hex32_to_rgba_normalized(0x202427, color_nv_body, 0.90); hex32_to_rgba_normalized(0x77B900, color_nv_accent,0.90); + hex32_to_rgba_normalized(0x202427, footer_bg_color_real, 1.00); header_bg_color = color_nv_header; body_bg_color = color_nv_body; highlighted_entry_color = color_nv_accent; - footer_bg_color = color_nv_body; + footer_bg_color = footer_bg_color_real; active_tab_marker_color = color_nv_accent; font_normal_color = 0xbbc0c4ff; @@ -984,6 +992,8 @@ static void mui_frame(void *data) break; } + menu_display_set_alpha(footer_bg_color, 1.00); + video_driver_get_size(&width, &height); menu_display_set_viewport();