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

Fix word wrapped widget length (#15905)

This commit is contained in:
sonninnos 2023-11-14 19:51:43 +02:00 committed by GitHub
parent f091b5a9e9
commit b341d90c2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gfx/gfx_widgets.c
View File

@ -293,6 +293,8 @@ void gfx_widgets_msg_queue_push(
/* Text is too wide, split it into two lines */ /* Text is too wide, split it into two lines */
if (text_width > width) if (text_width > width)
{ {
size_t wrap_length = 0;
/* If the second line is too short, the widget may /* If the second line is too short, the widget may
* look unappealing - ensure that second line is at * look unappealing - ensure that second line is at
* least 25% of the total width */ * least 25% of the total width */
@ -303,6 +305,24 @@ void gfx_widgets_msg_queue_push(
(int)((title_length * width) / text_width), (int)((title_length * width) / text_width),
100, 2); 100, 2);
/* Recalculate widget width with longest wrapped line */
wrap_length = string_index_last_occurance(msg, '\n');
if (wrap_length)
{
title_length -= wrap_length;
if (title_length < wrap_length)
title_length = wrap_length;
text_width = font_driver_get_message_width(
p_dispwidget->gfx_widget_fonts.msg_queue.font,
title,
title_length,
1.0f);
width = text_width;
}
msg_widget->text_height *= 2; msg_widget->text_height *= 2;
msg_widget->msg_len = strlen(msg); msg_widget->msg_len = strlen(msg);
} }
@ -313,8 +333,7 @@ void gfx_widgets_msg_queue_push(
} }
msg_widget->msg = msg; msg_widget->msg = msg;
msg_widget->width = width msg_widget->width = width + (p_dispwidget->simple_widget_padding / 2);
+ p_dispwidget->simple_widget_padding / 2;
} }
fifo_write(&p_dispwidget->msg_queue, fifo_write(&p_dispwidget->msg_queue,