Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix invalid 2D global position when read outside tree #75509

Merged
merged 1 commit into from
Apr 19, 2023
+8 −0
Merged

Fix invalid 2D global position when read outside tree #75509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions scene/main/canvas_item.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,10 @@ void CanvasItem::_redraw_callback() {
pending_update = false; // don't change to false until finished drawing (avoid recursive update)
}

void CanvasItem::_invalidate_global_transform() {
global_invalid = true;
}

Transform2D CanvasItem::get_global_transform_with_canvas() const {
if (canvas_layer) {
return canvas_layer->get_final_transform() * get_global_transform();
Expand Down Expand Up @@ -290,6 +294,7 @@ void CanvasItem::_notification(int p_what) {
}
}

global_invalid = true;
_enter_canvas();

RenderingServer::get_singleton()->canvas_item_set_visible(canvas_item, is_visible_in_tree()); // The visibility of the parent may change.
Expand Down Expand Up @@ -403,6 +408,7 @@ void CanvasItem::set_as_top_level(bool p_top_level) {

if (!is_inside_tree()) {
top_level = p_top_level;
propagate_call(SNAME("_invalidate_global_transform"));
return;
}

Expand Down Expand Up @@ -950,6 +956,7 @@ void CanvasItem::_validate_property(PropertyInfo &p_property) const {

void CanvasItem::_bind_methods() {
ClassDB::bind_method(D_METHOD("_top_level_raise_self"), &CanvasItem::_top_level_raise_self);
ClassDB::bind_method(D_METHOD("_invalidate_global_transform"), &CanvasItem::_invalidate_global_transform);

#ifdef TOOLS_ENABLED
ClassDB::bind_method(D_METHOD("_edit_set_state", "state"), &CanvasItem::_edit_set_state);
Expand Down
1 change: 1 addition & 0 deletions scene/main/canvas_item.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ class CanvasItem : public Node {
virtual void _top_level_changed_on_parent();

void _redraw_callback();
void _invalidate_global_transform();

void _enter_canvas();
void _exit_canvas();
Expand Down