mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 03:23:15 +01:00
Code Issues Releases Wiki Activity

Added dynamic window resizing on change of text. Fixed cursor display issue

Browse Source
This commit is contained in:
Duncan Frost
2014-12-22 16:50:35 +00:00
parent f93aeb33c6
commit ba93cd337b
1 changed files with 51 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/windows/text_input.c
View File

@@ -106,11 +106,30 @@ void window_text_input_open(rct_window* call_w, int call_widget, rct_string_id t
{
_maxInputLength = maxLength;
int no_lines = (_maxInputLength - 1) / MAX_LINE_LENGTH;
int height = WH + no_lines * 10;
window_close_by_class(WC_TEXTINPUT);
// Clear the text input buffer
memset(text_input, 0, maxLength);
// Enter in the the text input buffer any existing
// text.
format_string(text_input, existing_text, &existing_args);
// This is the text displayed above the input box
input_text_description = description;
// Work out the existing size of the window
char wrapped_string[512];
strcpy(wrapped_string, text_input);
int no_lines = 0, font_height = 0;
// String length needs to add 12 either side of box
// +13 for cursor when max length.
gfx_wrap_string(wrapped_string, WW - (24 + 13), &no_lines, &font_height);
int height = no_lines * 10 + WH;
// Window will be in the center of the screen
rct_window* w = window_create(
(RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_WIDTH, sint16) / 2) - WW / 2,
@@ -127,16 +146,6 @@ void window_text_input_open(rct_window* call_w, int call_widget, rct_string_id t
window_text_input_widgets[WIDX_TITLE].image = title;
// Clear the text input buffer
memset(text_input, 0, maxLength);
// Enter in the the text input buffer any existing
// text.
format_string(text_input, existing_text, &existing_args);
// This is the text displayed above the input box
input_text_description = description;
// Save calling window details so that the information
// can be passed back to the correct window & widget
calling_class = call_w->classification;
@@ -195,22 +204,24 @@ static void window_text_input_paint(){
int y = w->y + 25;
int no_lines = (_maxInputLength - 1) / MAX_LINE_LENGTH;
int no_lines = 0;
int font_height = 0;
int height = WH + no_lines * 10;
gfx_draw_string_centred(dpi, input_text_description, w->x + WW / 2, y, w->colours[1], 0);
y += 25;
gfx_fill_rect_inset(dpi, w->x + 10, y, w->x + WW - 10, y + 10 * (no_lines + 1) + 2, w->colours[1], 0x60);
y += 1;
char wrapped_string[512];
strcpy(wrapped_string, text_input);
gfx_wrap_string(wrapped_string, WW - 24, &no_lines, &font_height);
// String length needs to add 12 either side of box
// +13 for cursor when max length.
gfx_wrap_string(wrapped_string, WW - (24 + 13), &no_lines, &font_height);
gfx_fill_rect_inset(dpi, w->x + 10, y, w->x + WW - 10, y + 10 * (no_lines + 1) + 3, w->colours[1], 0x60);
y += 1;
char* wrap_pointer = wrapped_string;
int char_count = 0;
@@ -294,9 +305,27 @@ static void window_text_input_close(){
}
static void window_text_input_invalidate(){
int no_lines = (_maxInputLength - 1) / MAX_LINE_LENGTH;
rct_window* w;
int height = WH + no_lines * 10;
window_get_register(w);
// Work out the existing size of the window
char wrapped_string[512];
strcpy(wrapped_string, text_input);
int no_lines = 0, font_height = 0;
// String length needs to add 12 either side of box
// +13 for cursor when max length.
gfx_wrap_string(wrapped_string, WW - (24 + 13), &no_lines, &font_height);
int height = no_lines * 10 + WH;
// Change window size if required.
if (height != w->height) {
window_invalidate(w);
window_set_resize(w, WW, height, WW, height);
}
window_text_input_widgets[WIDX_OKAY].top = height - 21;
window_text_input_widgets[WIDX_OKAY].bottom = height - 10;