浏览代码

CanvasItem Fix ENTER_CANVAS / VISIBILITY_CHANGED notifications order when entering tree

kleonc 2 年之前
父节点
当前提交
6e3820fd4d
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      scene/main/canvas_item.cpp

+ 2 - 1
scene/main/canvas_item.cpp

@@ -289,11 +289,12 @@ void CanvasItem::_notification(int p_what) {
 				}
 				}
 			}
 			}
 
 
+			_enter_canvas();
+
 			RenderingServer::get_singleton()->canvas_item_set_visible(canvas_item, is_visible_in_tree()); // The visibility of the parent may change.
 			RenderingServer::get_singleton()->canvas_item_set_visible(canvas_item, is_visible_in_tree()); // The visibility of the parent may change.
 			if (is_visible_in_tree()) {
 			if (is_visible_in_tree()) {
 				notification(NOTIFICATION_VISIBILITY_CHANGED); // Considered invisible until entered.
 				notification(NOTIFICATION_VISIBILITY_CHANGED); // Considered invisible until entered.
 			}
 			}
-			_enter_canvas();
 
 
 			_update_texture_filter_changed(false);
 			_update_texture_filter_changed(false);
 			_update_texture_repeat_changed(false);
 			_update_texture_repeat_changed(false);