Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-07 13:49:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #112991 from syntaxerror247/fix-completion-popup-placement

Browse source 
Fix completion popup placement and adjust lines to available space
This commit is contained in:
Thaddeus Crews 2025-12-02 11:52:12 -06:00
commit 554c2ab374
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
2 changed files with 30 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

32
scene/gui/code_edit.cpp
View file

@ -138,14 +138,14 @@ void CodeEdit::_notification(int p_what) {
/* Code completion */
if (draw_code_completion) {
const int code_completion_options_count = code_completion_options.size();
const int lines = MIN(code_completion_options_count, theme_cache.code_completion_max_lines);
int lines = MIN(code_completion_options_count, theme_cache.code_completion_max_lines);
const Size2 icon_area_size(row_height, row_height);
code_completion_rect.size.width = code_completion_longest_line + theme_cache.code_completion_icon_separation + icon_area_size.width + 2;
code_completion_rect.size.height = lines * row_height;
const Point2 caret_pos = get_caret_draw_pos();
const int total_height = theme_cache.code_completion_style->get_minimum_size().y + code_completion_rect.size.height;
int total_height = theme_cache.code_completion_style->get_minimum_size().y + code_completion_rect.size.height;
int min_y = caret_pos.y - row_height;
int max_y = caret_pos.y + row_height + total_height;
if (draw_code_hint) {
@ -156,9 +156,31 @@ void CodeEdit::_notification(int p_what) {
}
}
const bool can_fit_completion_above = (min_y > total_height);
const bool can_fit_completion_below = (max_y <= get_size().height);
if (!can_fit_completion_below && can_fit_completion_above) {
const bool can_fit_completion_above = min_y > total_height;
const bool can_fit_completion_below = max_y <= get_size().height;
bool should_place_above = !can_fit_completion_below && can_fit_completion_above;
if (!can_fit_completion_below && !can_fit_completion_above) {
const int space_above = caret_pos.y - row_height;
const int space_below = get_size().height - caret_pos.y;
should_place_above = space_above > space_below;
// Reduce the line count and recalculate heights to better fit the completion popup.
int space_avail;
if (should_place_above) {
space_avail = space_above - theme_cache.code_completion_style->get_minimum_size().y;
} else {
space_avail = space_below - theme_cache.code_completion_style->get_minimum_size().y;
}
int max_lines_fit = MAX(1, space_avail / row_height);
lines = MIN(lines, max_lines_fit);
code_completion_rect.size.height = lines * row_height;
total_height = theme_cache.code_completion_style->get_minimum_size().y + code_completion_rect.size.height;
}
if (should_place_above) {
code_completion_rect.position.y = (caret_pos.y - total_height - row_height) + theme_cache.line_spacing;
if (draw_code_hint && !code_hint_draw_below) {
code_completion_rect.position.y -= code_hint_minsize.y;

6
tests/scene/test_code_edit.h
View file

@ -4158,15 +4158,15 @@ TEST_CASE("[SceneTree][CodeEdit] completion") {
CHECK(code_edit->get_code_completion_selected_index() == 0);
/* Single click selects. */
caret_pos.y += code_edit->get_line_height() * 2;
caret_pos.y += code_edit->get_line_height();
SEND_GUI_MOUSE_BUTTON_EVENT(caret_pos, MouseButton::LEFT, MouseButtonMask::LEFT, Key::NONE);
SEND_GUI_MOUSE_BUTTON_RELEASED_EVENT(caret_pos, MouseButton::LEFT, MouseButtonMask::NONE, Key::NONE);
CHECK(code_edit->get_code_completion_selected_index() == 2);
CHECK(code_edit->get_code_completion_selected_index() == 1);
/* Double click inserts. */
SEND_GUI_DOUBLE_CLICK(caret_pos, Key::NONE);
CHECK(code_edit->get_code_completion_selected_index() == -1);
CHECK(code_edit->get_line(0) == "item_2");
CHECK(code_edit->get_line(0) == "item_1");
code_edit->set_auto_brace_completion_enabled(false);