Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-06 04:43:45 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

ui_draw_text_box now iterates until its calculations converge. It also

Browse Source 
adds a small epsilon value to the wrap width to allow for FP computation
tweaks.
This commit is contained in:
Aaron Giles 2010-10-24 20:47:27 +00:00
parent 4cd55f3c0a
commit 504cee4992
1 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/emu/ui.c
View File

@ -722,35 +722,43 @@ void ui_draw_text_full(render_container *container, const char *origs, float x,
void ui_draw_text_box(render_container *container, const char *text, int justify, float xpos, float ypos, rgb_t backcolor) void ui_draw_text_box(render_container *container, const char *text, int justify, float xpos, float ypos, rgb_t backcolor)
{ {
float target_width, target_height; float line_height = ui_get_line_height(container->manager().machine());
float target_width = 2.0f - ((xpos <= 0.5f) ? xpos : 1.0f - xpos) - 2.0f * UI_BOX_LR_BORDER;
float target_height = line_height;
float target_x, target_y; float target_x, target_y;
float last_target_height = 0;
/* compute the multi-line target width/height */ do
ui_draw_text_full(container, text, 0, 0, 1.0f - 2.0f * UI_BOX_LR_BORDER, {
justify, WRAP_WORD, DRAW_NONE, ARGB_WHITE, ARGB_BLACK, &target_width, &target_height); /* determine the target location */
if (target_height > 1.0f - 2.0f * UI_BOX_TB_BORDER) target_x = xpos - 0.5f * target_width;
target_height = floor((1.0f - 2.0f * UI_BOX_TB_BORDER) / ui_get_line_height(container->manager().machine())) * ui_get_line_height(container->manager().machine()); target_y = ypos - 0.5f * target_height;
/* determine the target location */ /* make sure we stay on-screen */
target_x = xpos - 0.5f * target_width; if (target_x < UI_BOX_LR_BORDER)
target_y = ypos - 0.5f * target_height; target_x = UI_BOX_LR_BORDER;
if (target_x + target_width + UI_BOX_LR_BORDER > 1.0f)
target_x = 1.0f - UI_BOX_LR_BORDER - target_width;
if (target_y < UI_BOX_TB_BORDER)
target_y = UI_BOX_TB_BORDER;
if (target_y + target_height + UI_BOX_TB_BORDER > 1.0f)
target_y = 1.0f - UI_BOX_TB_BORDER - target_height;
/* make sure we stay on-screen */ /* compute the multi-line target width/height */
if (target_x < UI_BOX_LR_BORDER) last_target_height = target_height;
target_x = UI_BOX_LR_BORDER; ui_draw_text_full(container, text, target_x, target_y, target_width + 0.00001,
if (target_x + target_width + UI_BOX_LR_BORDER > 1.0f) justify, WRAP_WORD, DRAW_NONE, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, &target_width, &target_height);
target_x = 1.0f - UI_BOX_LR_BORDER - target_width; if (target_height > 1.0f - 2.0f * UI_BOX_TB_BORDER)
if (target_y < UI_BOX_TB_BORDER) target_height = floor((1.0f - 2.0f * UI_BOX_TB_BORDER) / line_height) * line_height;
target_y = UI_BOX_TB_BORDER;
if (target_y + target_height + UI_BOX_TB_BORDER > 1.0f) } while (target_height != last_target_height);
target_y = 1.0f - UI_BOX_TB_BORDER - target_height;
/* add a box around that */ /* add a box around that */
ui_draw_outlined_box(container, target_x - UI_BOX_LR_BORDER, ui_draw_outlined_box(container, target_x - UI_BOX_LR_BORDER,
target_y - UI_BOX_TB_BORDER, target_y - UI_BOX_TB_BORDER,
target_x + target_width + UI_BOX_LR_BORDER, target_x + target_width + UI_BOX_LR_BORDER,
target_y + target_height + UI_BOX_TB_BORDER, backcolor); target_y + target_height + UI_BOX_TB_BORDER, backcolor);
ui_draw_text_full(container, text, target_x, target_y, target_width, ui_draw_text_full(container, text, target_x, target_y, target_width + 0.00001,
justify, WRAP_WORD, DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, NULL, NULL); justify, WRAP_WORD, DRAW_NORMAL, UI_TEXT_COLOR, UI_TEXT_BG_COLOR, NULL, NULL);
} }