ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Widget color+position adjustments (#14195)

This commit is contained in:
sonninnos 2022-07-22 03:36:49 +03:00 committed by GitHub
parent 09d9366bc0
commit 1245cbc63b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gfx/gfx_widgets.c
View File

@ -865,9 +865,14 @@ static void gfx_widgets_layout(
if (p_dispwidget->msg_queue_has_icons) if (p_dispwidget->msg_queue_has_icons)
{ {
#if 0
p_dispwidget->msg_queue_icon_size_y = p_dispwidget->msg_queue_height p_dispwidget->msg_queue_icon_size_y = p_dispwidget->msg_queue_height
* 1.2347826087f; /* original image is 280x284 */ * 1.2347826087f; /* original image is 280x284 */
p_dispwidget->msg_queue_icon_size_x = 0.98591549295f * p_dispwidget->msg_queue_icon_size_y; p_dispwidget->msg_queue_icon_size_x = 0.98591549295f * p_dispwidget->msg_queue_icon_size_y;
#else
p_dispwidget->msg_queue_icon_size_y = p_dispwidget->msg_queue_height * 1.2f;
p_dispwidget->msg_queue_icon_size_x = p_dispwidget->msg_queue_icon_size_y;
#endif
} }
else else
{ {
@ -875,7 +880,7 @@ static void gfx_widgets_layout(
p_dispwidget->msg_queue_icon_size_y = 0; p_dispwidget->msg_queue_icon_size_y = 0;
} }
p_dispwidget->msg_queue_spacing = p_dispwidget->msg_queue_height / 3; p_dispwidget->msg_queue_spacing = p_dispwidget->msg_queue_height / 3.3f;
p_dispwidget->msg_queue_rect_start_x = p_dispwidget->msg_queue_spacing + p_dispwidget->msg_queue_icon_size_x; p_dispwidget->msg_queue_rect_start_x = p_dispwidget->msg_queue_spacing + p_dispwidget->msg_queue_icon_size_x;
p_dispwidget->msg_queue_internal_icon_size = p_dispwidget->msg_queue_icon_size_y; p_dispwidget->msg_queue_internal_icon_size = p_dispwidget->msg_queue_icon_size_y;
p_dispwidget->msg_queue_internal_icon_offset = (p_dispwidget->msg_queue_icon_size_y - p_dispwidget->msg_queue_internal_icon_size) / 2; p_dispwidget->msg_queue_internal_icon_offset = (p_dispwidget->msg_queue_icon_size_y - p_dispwidget->msg_queue_internal_icon_size) / 2;
@ -1359,8 +1364,8 @@ static void gfx_widgets_draw_regular_msg(
unsigned video_width, unsigned video_width,
unsigned video_height) unsigned video_height)
{ {
static float msg_queue_info[16] = static float msg_queue_info[16] = COLOR_HEX_TO_FLOAT(0x12ACF8, 1.0f);
COLOR_HEX_TO_FLOAT(0x12ACF8, 1.0f); static float msg_queue_bar[16] = COLOR_HEX_TO_FLOAT(0xDDDDDD, 1.0f);
unsigned bar_width; unsigned bar_width;
unsigned bar_margin; unsigned bar_margin;
unsigned text_color; unsigned text_color;
@ -1387,7 +1392,6 @@ static void gfx_widgets_draw_regular_msg(
gfx_widgets_flush_text(video_width, video_height, gfx_widgets_flush_text(video_width, video_height,
&p_dispwidget->gfx_widget_fonts.msg_queue); &p_dispwidget->gfx_widget_fonts.msg_queue);
gfx_display_scissor_begin(p_disp, gfx_display_scissor_begin(p_disp,
userdata, userdata,
video_width, video_height, video_width, video_height,
@ -1399,14 +1403,14 @@ static void gfx_widgets_draw_regular_msg(
/* Background */ /* Background */
bar_width = p_dispwidget->simple_widget_padding + msg->width + p_dispwidget->msg_queue_icon_size_x; bar_width = p_dispwidget->simple_widget_padding + msg->width + p_dispwidget->msg_queue_icon_size_x;
bar_margin = 4; bar_margin = p_dispwidget->msg_queue_icon_size_x * 0.04f;
gfx_display_draw_quad( gfx_display_draw_quad(
p_disp, p_disp,
userdata, userdata,
video_width, video_width,
video_height, video_height,
p_dispwidget->msg_queue_rect_start_x - p_dispwidget->msg_queue_icon_size_x + bar_margin, p_dispwidget->msg_queue_rect_start_x - p_dispwidget->msg_queue_icon_size_x,
video_height - msg->offset_y, video_height - msg->offset_y,
bar_width - bar_margin, bar_width - bar_margin,
p_dispwidget->msg_queue_height, p_dispwidget->msg_queue_height,
@ -1421,13 +1425,13 @@ static void gfx_widgets_draw_regular_msg(
userdata, userdata,
video_width, video_width,
video_height, video_height,
p_dispwidget->msg_queue_rect_start_x - p_dispwidget->msg_queue_icon_size_x, p_dispwidget->msg_queue_rect_start_x - p_dispwidget->msg_queue_icon_size_x - bar_margin,
video_height - msg->offset_y, video_height - msg->offset_y,
bar_margin, bar_margin,
p_dispwidget->msg_queue_height, p_dispwidget->msg_queue_height,
video_width, video_width,
video_height, video_height,
p_dispwidget->pure_white, msg_queue_bar,
NULL NULL
); );
@ -2014,7 +2018,7 @@ bool gfx_widgets_init(
const char *dir_assets, char *font_path) const char *dir_assets, char *font_path)
{ {
size_t i; size_t i;
unsigned color = 0x222222; unsigned color = 0x1A1A1A;
dispgfx_widget_t *p_dispwidget = &dispwidget_st; dispgfx_widget_t *p_dispwidget = &dispwidget_st;
gfx_display_t *p_disp = (gfx_display_t*)data_disp; gfx_display_t *p_disp = (gfx_display_t*)data_disp;
gfx_animation_t *p_anim = (gfx_animation_t*)data_anim; gfx_animation_t *p_anim = (gfx_animation_t*)data_anim;