godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-08 12:40:44 +00:00
Code Releases Wiki Activity

Fix crash in code completion when using an invalid / null font

Browse Source
This commit is contained in:
Paulb23
2022-10-16 16:47:27 +01:00
parent 76005e5ff7
commit b5dc8e24be
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scene/gui/code_edit.cpp
View File

@@ -2859,7 +2859,9 @@ void CodeEdit::_filter_code_completion_candidates_impl() {
offset = line_height; offset = line_height;
} }
max_width = MAX(max_width, font->get_string_size(option.display, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size).width + offset); if (font.is_valid()) {
max_width = MAX(max_width, font->get_string_size(option.display, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size).width + offset);
}
code_completion_options.push_back(option); code_completion_options.push_back(option);
} }
@@ -2970,7 +2972,9 @@ void CodeEdit::_filter_code_completion_candidates_impl() {
if (string_to_complete.length() == 0) { if (string_to_complete.length() == 0) {
code_completion_options.push_back(option); code_completion_options.push_back(option);
max_width = MAX(max_width, font->get_string_size(option.display, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size).width + offset); if (font.is_valid()) {
max_width = MAX(max_width, font->get_string_size(option.display, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size).width + offset);
}
continue; continue;
} }
@@ -3076,7 +3080,9 @@ void CodeEdit::_filter_code_completion_candidates_impl() {
option.matches.append_array(ssq_matches); option.matches.append_array(ssq_matches);
completion_options_subseq.push_back(option); completion_options_subseq.push_back(option);
} }
max_width = MAX(max_width, font->get_string_size(option.display, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size).width + offset); if (font.is_valid()) {
max_width = MAX(max_width, font->get_string_size(option.display, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size).width + offset);
}
} else if (!*ssq_lower) { // Matched the whole subsequence in s_lower. } else if (!*ssq_lower) { // Matched the whole subsequence in s_lower.
option.matches.clear(); option.matches.clear();
@@ -3093,7 +3099,9 @@ void CodeEdit::_filter_code_completion_candidates_impl() {
option.matches.append_array(ssq_lower_matches); option.matches.append_array(ssq_lower_matches);
completion_options_subseq_casei.push_back(option); completion_options_subseq_casei.push_back(option);
} }
max_width = MAX(max_width, font->get_string_size(option.display, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size).width + offset); if (font.is_valid()) {
max_width = MAX(max_width, font->get_string_size(option.display, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size).width + offset);
}
} }
} }