mirror
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #112830 from BrotherShort/fix-tree-edge 

Fix clicking the tree edge is ineffective
This commit is contained in:
Thaddeus Crews 2025-12-15 08:01:06 -06:00
parent 14d8c55cfa 59e8acbb36
commit 8787f581f9
No known key found for this signature in database
GPG Key ID: 8C6E5FEB5FC03CCC
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
scene/gui/tree.cpp
View File

@ -2348,7 +2348,7 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2
r_self_height = compute_item_height(p_item); r_self_height = compute_item_height(p_item);
label_h = r_self_height + theme_cache.v_separation; label_h = r_self_height + theme_cache.v_separation;
if (p_pos.y + label_h - theme_cache.offset.y < 0) { if (p_pos.y + label_h - theme_cache.offset.y + p_draw_ofs.y < 0) {
continue; // No need to draw. continue; // No need to draw.
} }
@ -2708,7 +2708,7 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2
} }
} }
if (p_pos.y + label_h - theme_cache.offset.y >= 0) { if (p_pos.y + label_h - theme_cache.offset.y + p_draw_ofs.y >= 0) {
// Draw the folding arrow. // Draw the folding arrow.
if (!p_item->disable_folding && !hide_folding && p_item->first_child && p_item->get_visible_child_count() != 0) { // Has visible children, draw the guide box. if (!p_item->disable_folding && !hide_folding && p_item->first_child && p_item->get_visible_child_count() != 0) { // Has visible children, draw the guide box.
Ref<Texture2D> arrow; Ref<Texture2D> arrow;
@ -6230,9 +6230,10 @@ void Tree::_find_button_at_pos(const Point2 &p_pos, TreeItem *&r_item, int &r_co
if (cache.rtl) { if (cache.rtl) {
pos.x = get_size().width - pos.x - 1; pos.x = get_size().width - pos.x - 1;
} }
pos -= theme_cache.panel_style->get_offset(); Point2 margin_offset = theme_cache.panel_style->get_offset();
pos -= margin_offset;
pos.y -= _get_title_button_height(); pos.y -= _get_title_button_height();
if (pos.y < 0) { if (pos.y + margin_offset.y < 0) {
return; return;
} }
pos += theme_cache.offset; // Scrolling. pos += theme_cache.offset; // Scrolling.
@ -6355,9 +6356,10 @@ int Tree::get_column_at_position(const Point2 &p_pos) const {
if (is_layout_rtl()) { if (is_layout_rtl()) {
pos.x = get_size().width - pos.x - 1; pos.x = get_size().width - pos.x - 1;
} }
pos -= theme_cache.panel_style->get_offset(); Point2 margin_offset = theme_cache.panel_style->get_offset();
pos -= margin_offset;
pos.y -= _get_title_button_height(); pos.y -= _get_title_button_height();
if (pos.y < 0) { if (pos.y + margin_offset.y < 0) {
return -1; return -1;
} }
@ -6386,9 +6388,10 @@ int Tree::get_drop_section_at_position(const Point2 &p_pos) const {
if (is_layout_rtl()) { if (is_layout_rtl()) {
pos.x = get_size().width - pos.x - 1; pos.x = get_size().width - pos.x - 1;
} }
pos -= theme_cache.panel_style->get_offset(); Point2 margin_offset = theme_cache.panel_style->get_offset();
pos -= margin_offset;
pos.y -= _get_title_button_height(); pos.y -= _get_title_button_height();
if (pos.y < 0) { if (pos.y + margin_offset.y < 0) {
return -100; return -100;
} }
@ -6435,9 +6438,10 @@ TreeItem *Tree::get_item_at_position(const Point2 &p_pos) const {
if (is_layout_rtl()) { if (is_layout_rtl()) {
pos.x = get_size().width - pos.x - 1; pos.x = get_size().width - pos.x - 1;
} }
pos -= theme_cache.panel_style->get_offset(); Point2 margin_offset = theme_cache.panel_style->get_offset();
pos -= margin_offset;
pos.y -= _get_title_button_height(); pos.y -= _get_title_button_height();
if (pos.y < 0) { if (pos.y + margin_offset.y < 0) {
return nullptr; return nullptr;
} }