godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Control not disconnecting signal

Browse Source 
If a Control has not parent CanvasItem and is set as top_level, then it does not disconnect from the "size_changed" signal when it leaves the Canvas.
This patch corrects this.
This commit is contained in:
Markus Sauermann 2022-10-05 23:26:41 +02:00
parent ea9bb98f26
commit c0f0f26615
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scene/gui/control.cpp
View File

@ -2885,8 +2885,8 @@ void Control::_notification(int p_notification) {
if (data.parent_canvas_item) { if (data.parent_canvas_item) {
data.parent_canvas_item->disconnect("item_rect_changed", callable_mp(this, &Control::_size_changed)); data.parent_canvas_item->disconnect("item_rect_changed", callable_mp(this, &Control::_size_changed));
data.parent_canvas_item = nullptr; data.parent_canvas_item = nullptr;
} else if (!is_set_as_top_level()) { } else {
//disconnect viewport // Disconnect viewport.
Viewport *viewport = get_viewport(); Viewport *viewport = get_viewport();
ERR_FAIL_COND(!viewport); ERR_FAIL_COND(!viewport);
viewport->disconnect("size_changed", callable_mp(this, &Control::_size_changed)); viewport->disconnect("size_changed", callable_mp(this, &Control::_size_changed));