From 3d64d50f5caa958b2ee16adf224d36ed2ebe0928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= Date: Tue, 27 Oct 2015 18:42:28 +0700 Subject: [PATCH] (GLUI) Fix text color, fix color and margin of the scrollbar to match material guidelines --- menu/drivers/glui.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c index 654fafc23a..9e149a2e78 100644 --- a/menu/drivers/glui.c +++ b/menu/drivers/glui.c @@ -191,10 +191,10 @@ static void glui_draw_scrollbar(gl_t *gl, unsigned width, unsigned height, GRflo int scrollbar_width = 4; glui_render_quad(gl, - width - scrollbar_width, - header_height + y, + width - scrollbar_width - 4, + header_height + y + 4, scrollbar_width, - scrollbar_height, + scrollbar_height - 8, width, height, coord_color); } @@ -462,10 +462,10 @@ static void glui_frame(void) 1, 1, 1, 0.75, }; GRfloat grey_bg[16]= { - 0.62, 0.62, 0.62, 1, - 0.62, 0.62, 0.62, 1, - 0.62, 0.62, 0.62, 1, - 0.62, 0.62, 0.62, 1, + 0.78, 0.78, 0.78, 1, + 0.78, 0.78, 0.78, 1, + 0.78, 0.78, 0.78, 1, + 0.78, 0.78, 0.78, 1, }; unsigned width, height, ticker_limit; char msg[PATH_MAX_LENGTH]; @@ -481,7 +481,7 @@ static void glui_frame(void) menu_handle_t *menu = menu_driver_get_ptr(); settings_t *settings = config_get_ptr(); uint64_t *frame_count = video_driver_get_frame_count(); - const uint32_t normal_color = 0x000000ff; + const uint32_t normal_color = 0x4d4d4eff; const uint32_t hover_color = 0x000000ff; const uint32_t title_color = 0xffffffff; @@ -882,8 +882,6 @@ static void glui_context_reset(void) "glui", sizeof(iconpath)); fill_pathname_slash(iconpath, sizeof(iconpath)); - printf("%s\n", iconpath); - glui_layout(menu, glui); glui_context_bg_destroy(glui); glui_allocate_white_texture(glui);