godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #101280 from Sauermann/fix-focus-rect-meta-access 

Fix `__focus_rect` meta access error when resizing `Tree`
This commit is contained in:
Thaddeus Crews 2025-01-27 09:46:23 -06:00
parent 82199a83ce 2a72f78427
commit 0dc6b7c056
No known key found for this signature in database
GPG Key ID: 62181B86FE9E5D84
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
scene/gui/tree.cpp
View File

@ -3822,12 +3822,7 @@ void Tree::gui_input(const Ref<InputEvent> &p_event) {
Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_VISIBLE); Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_VISIBLE);
warp_mouse(range_drag_capture_pos); warp_mouse(range_drag_capture_pos);
} else { } else {
Rect2 rect; Rect2 rect = _get_item_focus_rect(get_selected());
if (select_mode == SELECT_ROW) {
rect = get_selected()->get_meta("__focus_col_" + itos(selected_col));
} else {
rect = get_selected()->get_meta("__focus_rect");
}
Point2 mpos = mb->get_position(); Point2 mpos = mb->get_position();
int icon_size_x = 0; int icon_size_x = 0;
Ref<Texture2D> icon = get_selected()->get_icon(selected_col); Ref<Texture2D> icon = get_selected()->get_icon(selected_col);
@ -4205,12 +4200,7 @@ bool Tree::edit_selected(bool p_force_edit) {
} }
float popup_scale = popup_editor->is_embedded() ? 1.0 : popup_editor->get_parent_visible_window()->get_content_scale_factor(); float popup_scale = popup_editor->is_embedded() ? 1.0 : popup_editor->get_parent_visible_window()->get_content_scale_factor();
Rect2 rect; Rect2 rect = _get_item_focus_rect(s);
if (select_mode == SELECT_ROW) {
rect = s->get_meta("__focus_col_" + itos(selected_col));
} else {
rect = s->get_meta("__focus_rect");
}
rect.position *= popup_scale; rect.position *= popup_scale;
popup_edited_item = s; popup_edited_item = s;
popup_edited_item_col = col; popup_edited_item_col = col;
@ -4317,6 +4307,16 @@ bool Tree::edit_selected(bool p_force_edit) {
return false; return false;
} }
Rect2 Tree::_get_item_focus_rect(const TreeItem *p_item) const {
Rect2 rect;
if (select_mode == SELECT_ROW) {
rect = p_item->get_meta("__focus_col_" + itos(selected_col));
} else {
rect = p_item->get_meta("__focus_rect");
}
return rect;
}
bool Tree::is_editing() { bool Tree::is_editing() {
return popup_editor->is_visible(); return popup_editor->is_visible();
} }
@ -4599,7 +4599,7 @@ void Tree::_notification(int p_what) {
case NOTIFICATION_RESIZED: case NOTIFICATION_RESIZED:
case NOTIFICATION_TRANSFORM_CHANGED: { case NOTIFICATION_TRANSFORM_CHANGED: {
if (popup_edited_item != nullptr) { if (popup_edited_item != nullptr) {
Rect2 rect = popup_edited_item->get_meta("__focus_rect"); Rect2 rect = _get_item_focus_rect(popup_edited_item);
popup_editor->set_position(get_global_position() + rect.position); popup_editor->set_position(get_global_position() + rect.position);
popup_editor->set_size(rect.size); popup_editor->set_size(rect.size);

1
scene/gui/tree.h
View File

@ -716,6 +716,7 @@ private:
Rect2 _get_scrollbar_layout_rect() const; Rect2 _get_scrollbar_layout_rect() const;
Rect2 _get_content_rect() const; // Considering the background stylebox and scrollbars. Rect2 _get_content_rect() const; // Considering the background stylebox and scrollbars.
Rect2 _get_item_focus_rect(const TreeItem *p_item) const;
protected: protected:
virtual void _update_theme_item_cache() override; virtual void _update_theme_item_cache() override;