(GLUI) Fix text color, fix color and margin of the scrollbar to match material guidelines

This commit is contained in:
Jean-André Santoni 2015-10-27 18:42:28 +07:00
parent 0a36782f4a
commit 3d64d50f5c

View File

@ -191,10 +191,10 @@ static void glui_draw_scrollbar(gl_t *gl, unsigned width, unsigned height, GRflo
int scrollbar_width = 4; int scrollbar_width = 4;
glui_render_quad(gl, glui_render_quad(gl,
width - scrollbar_width, width - scrollbar_width - 4,
header_height + y, header_height + y + 4,
scrollbar_width, scrollbar_width,
scrollbar_height, scrollbar_height - 8,
width, height, width, height,
coord_color); coord_color);
} }
@ -462,10 +462,10 @@ static void glui_frame(void)
1, 1, 1, 0.75, 1, 1, 1, 0.75,
}; };
GRfloat grey_bg[16]= { GRfloat grey_bg[16]= {
0.62, 0.62, 0.62, 1, 0.78, 0.78, 0.78, 1,
0.62, 0.62, 0.62, 1, 0.78, 0.78, 0.78, 1,
0.62, 0.62, 0.62, 1, 0.78, 0.78, 0.78, 1,
0.62, 0.62, 0.62, 1, 0.78, 0.78, 0.78, 1,
}; };
unsigned width, height, ticker_limit; unsigned width, height, ticker_limit;
char msg[PATH_MAX_LENGTH]; char msg[PATH_MAX_LENGTH];
@ -481,7 +481,7 @@ static void glui_frame(void)
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
uint64_t *frame_count = video_driver_get_frame_count(); 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 hover_color = 0x000000ff;
const uint32_t title_color = 0xffffffff; const uint32_t title_color = 0xffffffff;
@ -882,8 +882,6 @@ static void glui_context_reset(void)
"glui", sizeof(iconpath)); "glui", sizeof(iconpath));
fill_pathname_slash(iconpath, sizeof(iconpath)); fill_pathname_slash(iconpath, sizeof(iconpath));
printf("%s\n", iconpath);
glui_layout(menu, glui); glui_layout(menu, glui);
glui_context_bg_destroy(glui); glui_context_bg_destroy(glui);
glui_allocate_white_texture(glui); glui_allocate_white_texture(glui);