From 4769e89b076e85c26debe78379cb98906baec19f Mon Sep 17 00:00:00 2001 From: IntelOrca Date: Mon, 29 Feb 2016 22:21:04 +0000 Subject: [PATCH] fix #3053: Long multiplayer group names overflow the dropdown --- src/windows/multiplayer.c | 14 ++++++++------ src/windows/player.c | 7 ++++--- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/windows/multiplayer.c b/src/windows/multiplayer.c index cf6aa6004e..4eda192be8 100644 --- a/src/windows/multiplayer.c +++ b/src/windows/multiplayer.c @@ -616,13 +616,14 @@ static void window_multiplayer_groups_paint(rct_window *w, rct_drawpixelinfo *dp int group = network_get_group_index(network_get_default_group()); if (group != -1) { RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS, uint16) = network_get_group_name_string_id(group); - gfx_draw_string_centred( + gfx_draw_string_centred_clipped( dpi, 1193, + (void*)RCT2_ADDRESS_COMMON_FORMAT_ARGS, + 0, w->x + (widget->left + widget->right - 11) / 2, w->y + widget->top, - 0, - (void*)RCT2_ADDRESS_COMMON_FORMAT_ARGS + widget->right - widget->left - 8 ); } @@ -639,13 +640,14 @@ static void window_multiplayer_groups_paint(rct_window *w, rct_drawpixelinfo *dp group = network_get_group_index(_selectedGroup); if (group != -1) { RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS, uint16) = network_get_group_name_string_id(group); - gfx_draw_string_centred( + gfx_draw_string_centred_clipped( dpi, 1193, + (void*)RCT2_ADDRESS_COMMON_FORMAT_ARGS, + 0, w->x + (widget->left + widget->right - 11) / 2, w->y + widget->top, - 0, - (void*)RCT2_ADDRESS_COMMON_FORMAT_ARGS + widget->right - widget->left - 8 ); } } diff --git a/src/windows/player.c b/src/windows/player.c index 561ed4cdf7..0f717ffedf 100644 --- a/src/windows/player.c +++ b/src/windows/player.c @@ -371,13 +371,14 @@ void window_player_overview_paint(rct_window *w, rct_drawpixelinfo *dpi) rct_widget* widget = &window_player_overview_widgets[WIDX_GROUP]; RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS, uint16) = network_get_group_name_string_id(groupindex); - gfx_draw_string_centred( + gfx_draw_string_centred_clipped( dpi, 1193, + (void*)RCT2_ADDRESS_COMMON_FORMAT_ARGS, + 0, w->x + (widget->left + widget->right - 11) / 2, w->y + widget->top, - 0, - (void*)RCT2_ADDRESS_COMMON_FORMAT_ARGS + widget->right - widget->left - 8 ); }