put challenge indicator above leaderboard trackers (#12530)

This commit is contained in:
Jamiras 2021-06-18 10:00:48 -06:00 committed by GitHub
parent ff7982fbcd
commit 81075aa5fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -121,6 +121,33 @@ static void gfx_widget_leaderboard_display_frame(void* data, void* userdata)
gfx_display_set_alpha(p_dispwidget->backdrop_orig, DEFAULT_BACKDROP);
gfx_display_set_alpha(pure_white, 1.0f);
for (i = 0; i < state->tracker_count; ++i)
{
const unsigned widget_width = state->tracker_info[i].width;
x = video_width - widget_width - spacing;
y -= (widget_height + spacing);
/* Backdrop */
gfx_display_draw_quad(
p_disp,
video_info->userdata,
video_width, video_height,
(int)x, (int)y, widget_width, widget_height,
video_width, video_height,
p_dispwidget->backdrop_orig);
/* Text */
gfx_widgets_draw_text(&p_dispwidget->gfx_widget_fonts.regular,
state->tracker_info[i].display,
(float)(x + CHEEVO_LBOARD_DISPLAY_PADDING),
(float)(y + widget_height - (CHEEVO_LBOARD_DISPLAY_PADDING - 1)
- p_dispwidget->gfx_widget_fonts.regular.line_descender),
video_width, video_height,
TEXT_COLOR_INFO,
TEXT_ALIGN_LEFT,
true);
}
if (state->challenge_count)
{
const unsigned widget_size = spacing * 4;
@ -164,33 +191,6 @@ static void gfx_widget_leaderboard_display_frame(void* data, void* userdata)
}
}
}
for (i = 0; i < state->tracker_count; ++i)
{
const unsigned widget_width = state->tracker_info[i].width;
x = video_width - widget_width - spacing;
y -= (widget_height + spacing);
/* Backdrop */
gfx_display_draw_quad(
p_disp,
video_info->userdata,
video_width, video_height,
(int)x, (int)y, widget_width, widget_height,
video_width, video_height,
p_dispwidget->backdrop_orig);
/* Text */
gfx_widgets_draw_text(&p_dispwidget->gfx_widget_fonts.regular,
state->tracker_info[i].display,
(float)(x + CHEEVO_LBOARD_DISPLAY_PADDING),
(float)(y + widget_height - (CHEEVO_LBOARD_DISPLAY_PADDING - 1)
- p_dispwidget->gfx_widget_fonts.regular.line_descender),
video_width, video_height,
TEXT_COLOR_INFO,
TEXT_ALIGN_LEFT,
true);
}
}
SLOCK_UNLOCK(state->array_lock);