godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-05 17:15:09 +00:00
Code Releases Wiki Activity

Merge pull request #102262 from KoBeWi/outer_tree_is_void

Browse Source 
Don't return Tree items outside visible rect
This commit is contained in:
Thaddeus Crews
2025-02-03 08:15:59 -06:00
parent bbf29a537f 886e5d8084
commit 3e34c4be96
2 changed files with 102 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

187
scene/gui/tree.cpp
View File

@@ -5494,22 +5494,30 @@ void Tree::_do_incr_search(const String &p_add) {
ensure_cursor_is_visible(); ensure_cursor_is_visible();
} }
TreeItem *Tree::_find_item_at_pos(TreeItem *p_item, const Point2 &p_pos, int &r_column, int &h, int &section) const { TreeItem *Tree::_find_item_at_pos(TreeItem *p_item, const Point2 &p_pos, int &r_column, int &r_height, int &r_section) const {
r_column = -1;
r_height = 0;
r_section = -100;
if (!root) {
return nullptr;
}
Point2 pos = p_pos; Point2 pos = p_pos;
if ((root != p_item || !hide_root) && p_item->is_visible_in_tree()) { if ((root != p_item || !hide_root) && p_item->is_visible_in_tree()) {
h = compute_item_height(p_item) + theme_cache.v_separation; r_height = compute_item_height(p_item) + theme_cache.v_separation;
if (pos.y < h) { if (pos.y < r_height) {
if (drop_mode_flags == DROP_MODE_ON_ITEM) { if (drop_mode_flags == DROP_MODE_ON_ITEM) {
section = 0; r_section = 0;
} else if (drop_mode_flags == DROP_MODE_INBETWEEN) { } else if (drop_mode_flags == DROP_MODE_INBETWEEN) {
section = pos.y < h / 2 ? -1 : 1; r_section = pos.y < r_height / 2 ? -1 : 1;
} else if (pos.y < h / 4) { } else if (pos.y < r_height / 4) {
section = -1; r_section = -1;
} else if (pos.y >= (h * 3 / 4)) { } else if (pos.y >= (r_height * 3 / 4)) {
section = 1; r_section = 1;
} else { } else {
section = 0; r_section = 0;
} }
for (int i = 0; i < columns.size(); i++) { for (int i = 0; i < columns.size(); i++) {
@@ -5524,10 +5532,10 @@ TreeItem *Tree::_find_item_at_pos(TreeItem *p_item, const Point2 &p_pos, int &r_
return nullptr; return nullptr;
} else { } else {
pos.y -= h; pos.y -= r_height;
} }
} else { } else {
h = 0; r_height = 0;
} }
if (p_item->is_collapsed() || !p_item->is_visible_in_tree()) { if (p_item->is_collapsed() || !p_item->is_visible_in_tree()) {
@@ -5537,9 +5545,9 @@ TreeItem *Tree::_find_item_at_pos(TreeItem *p_item, const Point2 &p_pos, int &r_
TreeItem *n = p_item->get_first_child(); TreeItem *n = p_item->get_first_child();
while (n) { while (n) {
int ch; int ch;
TreeItem *r = _find_item_at_pos(n, pos, r_column, ch, section); TreeItem *r = _find_item_at_pos(n, pos, r_column, ch, r_section);
pos.y -= ch; pos.y -= ch;
h += ch; r_height += ch;
if (r) { if (r) {
return r; return r;
} }
@@ -5630,62 +5638,64 @@ void Tree::_find_button_at_pos(const Point2 &p_pos, TreeItem *&r_item, int &r_co
} }
int Tree::get_column_at_position(const Point2 &p_pos) const { int Tree::get_column_at_position(const Point2 &p_pos) const {
if (root) { if (!root || !Rect2(Vector2(), get_size()).has_point(p_pos)) {
Point2 pos = p_pos; return -1;
if (is_layout_rtl()) {
pos.x = get_size().width - pos.x;
}
pos -= theme_cache.panel_style->get_offset();
pos.y -= _get_title_button_height();
if (pos.y < 0) {
return -1;
}
if (h_scroll->is_visible_in_tree()) {
pos.x += h_scroll->get_value();
}
if (v_scroll->is_visible_in_tree()) {
pos.y += v_scroll->get_value();
}
int col, h, section;
TreeItem *it = _find_item_at_pos(root, pos, col, h, section);
if (it) {
return col;
}
} }
Point2 pos = p_pos;
if (is_layout_rtl()) {
pos.x = get_size().width - pos.x;
}
pos -= theme_cache.panel_style->get_offset();
pos.y -= _get_title_button_height();
if (pos.y < 0) {
return -1;
}
if (h_scroll->is_visible_in_tree()) {
pos.x += h_scroll->get_value();
}
if (v_scroll->is_visible_in_tree()) {
pos.y += v_scroll->get_value();
}
int col, h, section;
TreeItem *it = _find_item_at_pos(root, pos, col, h, section);
if (it) {
return col;
}
return -1; return -1;
} }
int Tree::get_drop_section_at_position(const Point2 &p_pos) const { int Tree::get_drop_section_at_position(const Point2 &p_pos) const {
if (root) { if (!root || !Rect2(Vector2(), get_size()).has_point(p_pos)) {
Point2 pos = p_pos; return -100;
if (is_layout_rtl()) {
pos.x = get_size().width - pos.x;
}
pos -= theme_cache.panel_style->get_offset();
pos.y -= _get_title_button_height();
if (pos.y < 0) {
return -100;
}
if (h_scroll->is_visible_in_tree()) {
pos.x += h_scroll->get_value();
}
if (v_scroll->is_visible_in_tree()) {
pos.y += v_scroll->get_value();
}
int col, h, section;
TreeItem *it = _find_item_at_pos(root, pos, col, h, section);
if (it) {
return section;
}
} }
Point2 pos = p_pos;
if (is_layout_rtl()) {
pos.x = get_size().width - pos.x;
}
pos -= theme_cache.panel_style->get_offset();
pos.y -= _get_title_button_height();
if (pos.y < 0) {
return -100;
}
if (h_scroll->is_visible_in_tree()) {
pos.x += h_scroll->get_value();
}
if (v_scroll->is_visible_in_tree()) {
pos.y += v_scroll->get_value();
}
int col, h, section;
TreeItem *it = _find_item_at_pos(root, pos, col, h, section);
if (it) {
return section;
}
return -100; return -100;
} }
@@ -5708,36 +5718,41 @@ Variant Tree::get_drag_data(const Point2 &p_point) {
} }
TreeItem *Tree::get_item_at_position(const Point2 &p_pos) const { TreeItem *Tree::get_item_at_position(const Point2 &p_pos) const {
if (root) { if (!root || !Rect2(Vector2(), get_size()).has_point(p_pos)) {
Point2 pos = p_pos; return nullptr;
if (is_layout_rtl()) {
pos.x = get_size().width - pos.x;
}
pos -= theme_cache.panel_style->get_offset();
pos.y -= _get_title_button_height();
if (pos.y < 0) {
return nullptr;
}
if (h_scroll->is_visible_in_tree()) {
pos.x += h_scroll->get_value();
}
if (v_scroll->is_visible_in_tree()) {
pos.y += v_scroll->get_value();
}
int col, h, section;
TreeItem *it = _find_item_at_pos(root, pos, col, h, section);
if (it) {
return it;
}
} }
Point2 pos = p_pos;
if (is_layout_rtl()) {
pos.x = get_size().width - pos.x;
}
pos -= theme_cache.panel_style->get_offset();
pos.y -= _get_title_button_height();
if (pos.y < 0) {
return nullptr;
}
if (h_scroll->is_visible_in_tree()) {
pos.x += h_scroll->get_value();
}
if (v_scroll->is_visible_in_tree()) {
pos.y += v_scroll->get_value();
}
int col, h, section;
TreeItem *it = _find_item_at_pos(root, pos, col, h, section);
if (it) {
return it;
}
return nullptr; return nullptr;
} }
int Tree::get_button_id_at_position(const Point2 &p_pos) const { int Tree::get_button_id_at_position(const Point2 &p_pos) const {
if (!root || !Rect2(Vector2(), get_size()).has_point(p_pos)) {
return -1;
}
TreeItem *it; TreeItem *it;
int col, index; int col, index;
_find_button_at_pos(p_pos, it, col, index); _find_button_at_pos(p_pos, it, col, index);

2
scene/gui/tree.h
View File

@@ -669,7 +669,7 @@ private:
TreeItem *_search_item_text(TreeItem *p_at, const String &p_find, int *r_col, bool p_selectable, bool p_backwards = false); TreeItem *_search_item_text(TreeItem *p_at, const String &p_find, int *r_col, bool p_selectable, bool p_backwards = false);
TreeItem *_find_item_at_pos(TreeItem *p_item, const Point2 &p_pos, int &r_column, int &h, int &section) const; TreeItem *_find_item_at_pos(TreeItem *p_item, const Point2 &p_pos, int &r_column, int &r_height, int &r_section) const;
int _get_item_h_offset(TreeItem *p_item) const; int _get_item_h_offset(TreeItem *p_item) const;
void _find_button_at_pos(const Point2 &p_pos, TreeItem *&r_item, int &r_column, int &r_index) const; void _find_button_at_pos(const Point2 &p_pos, TreeItem *&r_item, int &r_column, int &r_index) const;