Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-31 05:31:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #104141 from BrotherShort/treeitem-rename-edit-offset

Browse source 
Fix the TreeItem rename LineEdit is offset
This commit is contained in:
Thaddeus Crews 2025-03-19 17:46:08 -05:00
commit a76c1ac1d6
No known key found for this signature in database
GPG key ID: 62181B86FE9E5D84
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
scene/gui/tree.cpp
View file

@ -4085,7 +4085,7 @@ bool Tree::edit_selected(bool p_force_edit) {
return false; return false;
} }
float popup_scale = popup_editor->is_embedded() ? 1.0 : popup_editor->get_parent_visible_window()->get_content_scale_factor(); real_t popup_scale = popup_editor->is_embedded() ? 1.0 : popup_editor->get_parent_visible_window()->get_content_scale_factor();
Rect2 rect = _get_item_focus_rect(s); Rect2 rect = _get_item_focus_rect(s);
rect.position *= popup_scale; rect.position *= popup_scale;
popup_edited_item = s; popup_edited_item = s;
@ -4127,13 +4127,16 @@ bool Tree::edit_selected(bool p_force_edit) {
Vector2 ofs(0, Math::floor((MAX(line_editor->get_minimum_size().height, rect.size.height - value_editor_height) - rect.size.height) / 2)); Vector2 ofs(0, Math::floor((MAX(line_editor->get_minimum_size().height, rect.size.height - value_editor_height) - rect.size.height) / 2));
// Account for icon. // Account for icon.
Size2 icon_size = _get_cell_icon_size(c) * popup_scale; real_t icon_ofs = 0;
if (c.icon.is_valid()) {
icon_ofs = _get_cell_icon_size(c).x * popup_scale + theme_cache.h_separation;
}
popup_rect.size = rect.size; popup_rect.size = rect.size;
popup_rect.size.x -= icon_size.x + theme_cache.h_separation; popup_rect.size.x -= icon_ofs;
popup_rect.position = rect.position - ofs; popup_rect.position = rect.position - ofs;
popup_rect.position.x += icon_size.x + theme_cache.h_separation; popup_rect.position.x += icon_ofs;
if (cache.rtl) { if (cache.rtl) {
popup_rect.position.x = get_size().width - popup_rect.position.x - popup_rect.size.x; popup_rect.position.x = get_size().width - popup_rect.position.x - popup_rect.size.x;
} }