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

Fix incorrect completion popup size of CodeEdit

Browse Source
This commit is contained in:
Yuri Roubinsky
2021-08-13 18:25:13 +03:00
parent 07c355c209
commit 6e87ff28ed
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
scene/gui/code_edit.cpp
View File

@@ -72,7 +72,7 @@ void CodeEdit::_notification(int p_what) {
can_fold_icon = get_theme_icon(SNAME("can_fold")); can_fold_icon = get_theme_icon(SNAME("can_fold"));
folded_icon = get_theme_icon(SNAME("folded")); folded_icon = get_theme_icon(SNAME("folded"));
code_completion_max_width = get_theme_constant(SNAME("completion_max_width")) * font->get_char_size('x').x; code_completion_max_width = get_theme_constant(SNAME("completion_max_width"));
code_completion_max_lines = get_theme_constant(SNAME("completion_lines")); code_completion_max_lines = get_theme_constant(SNAME("completion_lines"));
code_completion_scroll_width = get_theme_constant(SNAME("completion_scroll_width")); code_completion_scroll_width = get_theme_constant(SNAME("completion_scroll_width"));
code_completion_scroll_color = get_theme_color(SNAME("completion_scroll_color")); code_completion_scroll_color = get_theme_color(SNAME("completion_scroll_color"));
@@ -2652,6 +2652,8 @@ TypedArray<String> CodeEdit::_get_delimiters(DelimiterType p_type) const {
/* Code Completion */ /* Code Completion */
void CodeEdit::_filter_code_completion_candidates() { void CodeEdit::_filter_code_completion_candidates() {
ScriptInstance *si = get_script_instance(); ScriptInstance *si = get_script_instance();
int line_height = get_line_height();
if (si && si->has_method("_filter_code_completion_candidates")) { if (si && si->has_method("_filter_code_completion_candidates")) {
code_completion_options.clear(); code_completion_options.clear();
code_completion_base = ""; code_completion_base = "";
@@ -2691,11 +2693,16 @@ void CodeEdit::_filter_code_completion_candidates() {
option.icon = completion_options[i].get("icon"); option.icon = completion_options[i].get("icon");
option.default_value = completion_options[i].get("default_value"); option.default_value = completion_options[i].get("default_value");
max_width = MAX(max_width, font->get_string_size(option.display).width); int offset = 0;
if (option.default_value.get_type() == Variant::COLOR) {
offset = line_height;
}
max_width = MAX(max_width, font->get_string_size(option.display, font_size).width + offset);
code_completion_options.push_back(option); code_completion_options.push_back(option);
} }
code_completion_longest_line = MIN(max_width, code_completion_max_width); code_completion_longest_line = MIN(max_width, code_completion_max_width * font_size);
code_completion_current_selected = 0; code_completion_current_selected = 0;
code_completion_active = true; code_completion_active = true;
update(); update();
@@ -2783,6 +2790,11 @@ void CodeEdit::_filter_code_completion_candidates() {
option.display = option.display.unquote().quote("'"); option.display = option.display.unquote().quote("'");
} }
int offset = 0;
if (option.default_value.get_type() == Variant::COLOR) {
offset = line_height;
}
if (in_string != -1) { if (in_string != -1) {
String quote = single_quote ? "'" : "\""; String quote = single_quote ? "'" : "\"";
option.display = option.display.unquote().quote(quote); option.display = option.display.unquote().quote(quote);
@@ -2795,7 +2807,7 @@ void CodeEdit::_filter_code_completion_candidates() {
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).width); max_width = MAX(max_width, font->get_string_size(option.display, font_size).width + offset);
continue; continue;
} }
@@ -2844,7 +2856,7 @@ void CodeEdit::_filter_code_completion_candidates() {
} else { } else {
completion_options_subseq.push_back(option); completion_options_subseq.push_back(option);
} }
max_width = MAX(max_width, font->get_string_size(option.display).width); max_width = MAX(max_width, font->get_string_size(option.display, font_size).width + offset);
/* Matched the whole subsequence in s_lower. */ /* Matched the whole subsequence in s_lower. */
} else if (!*ssq_lower) { } else if (!*ssq_lower) {
/* Finished matching in the first s.length() characters. */ /* Finished matching in the first s.length() characters. */
@@ -2853,7 +2865,7 @@ void CodeEdit::_filter_code_completion_candidates() {
} else { } else {
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).width); max_width = MAX(max_width, font->get_string_size(option.display, font_size).width + offset);
} }
} }
@@ -2873,7 +2885,7 @@ void CodeEdit::_filter_code_completion_candidates() {
return; return;
} }
code_completion_longest_line = MIN(max_width, code_completion_max_width); code_completion_longest_line = MIN(max_width, code_completion_max_width * font_size);
code_completion_current_selected = 0; code_completion_current_selected = 0;
code_completion_active = true; code_completion_active = true;
update(); update();