diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2019-08-15 20:51:11 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-15 20:51:11 +0200 |
commit | de8ce3e625e74833aec6a5d165e7e82100a1dbf3 (patch) | |
tree | ccea2e966e3e6fe7cb05fef30584d7c8502dd7d2 | |
parent | b24228e03b950d5efdea18df0dd7b6fed58f0385 (diff) | |
parent | f8a986c094d14c3537a0300b1d70d5780cc081af (diff) |
Merge pull request #31392 from YeldhamDev/autocomplete_width_limit_fix
Fix autocompletion widget having its text leak outside
-rw-r--r-- | scene/gui/text_edit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 6e5f8de3b5..c0eaf21215 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -1403,7 +1403,7 @@ void TextEdit::_notification(int p_what) { } int line_from = CLAMP(completion_index - lines / 2, 0, completion_options.size() - lines); VisualServer::get_singleton()->canvas_item_add_rect(ci, Rect2(Point2(completion_rect.position.x, completion_rect.position.y + (completion_index - line_from) * get_row_height()), Size2(completion_rect.size.width, get_row_height())), cache.completion_selected_color); - draw_rect(Rect2(completion_rect.position + Vector2(icon_area_size.x + icon_hsep, 0), Size2(nofs, completion_rect.size.height)), cache.completion_existing_color); + draw_rect(Rect2(completion_rect.position + Vector2(icon_area_size.x + icon_hsep, 0), Size2(MIN(nofs, completion_rect.size.width - (icon_area_size.x + icon_hsep)), completion_rect.size.height)), cache.completion_existing_color); for (int i = 0; i < lines; i++) { @@ -1430,7 +1430,7 @@ void TextEdit::_notification(int p_what) { } title_pos.x = icon_area.position.x + icon_area.size.width + icon_hsep; - draw_string(cache.font, title_pos, completion_options[l].display, text_color, completion_rect.size.width); + draw_string(cache.font, title_pos, completion_options[l].display, text_color, completion_rect.size.width - (icon_area_size.x + icon_hsep)); } if (scrollw) { |