godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-20 14:45:44 +00:00
Code Releases Wiki Activity

Revert "Fix CanvasItem visibility propagation"

Browse Source 
This reverts commit 642591b6a9.
This commit is contained in:
Haoyu Qiu
2022-03-08 01:06:14 +08:00
parent 56bb43914f
commit ba0a17a458
4 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editor/plugins/canvas_item_editor_plugin.cpp
View File

@@ -3756,7 +3756,7 @@ void CanvasItemEditor::_draw_invisible_nodes_positions(Node *p_node, const Trans
} }
CanvasItem *canvas_item = Object::cast_to<CanvasItem>(p_node); CanvasItem *canvas_item = Object::cast_to<CanvasItem>(p_node);
if (canvas_item && !canvas_item->is_visible_in_tree()) { if (canvas_item && !canvas_item->is_visible()) {
return; return;
} }

19
scene/2d/canvas_item.cpp
View File

@@ -353,18 +353,16 @@ bool CanvasItem::is_visible_in_tree() const {
return visible && parent_visible_in_tree; return visible && parent_visible_in_tree;
} }
void CanvasItem::_propagate_visibility_changed(bool p_visible, bool p_is_source) { void CanvasItem::_propagate_visibility_changed(bool p_visible, bool p_was_visible) {
if (p_visible && first_draw) { //avoid propagating it twice if (p_visible && first_draw) { //avoid propagating it twice
first_draw = false; first_draw = false;
} }
if (!p_is_source) {
parent_visible_in_tree = p_visible; parent_visible_in_tree = p_visible;
}
notification(NOTIFICATION_VISIBILITY_CHANGED); notification(NOTIFICATION_VISIBILITY_CHANGED);
if (visible && p_visible) { if (visible && p_visible) {
update(); update();
} else if (!p_visible && (visible || p_is_source)) { } else if (!p_visible && (visible || p_was_visible)) {
emit_signal(SceneStringNames::get_singleton()->hide); emit_signal(SceneStringNames::get_singleton()->hide);
} }
_block(); _block();
@@ -372,12 +370,8 @@ void CanvasItem::_propagate_visibility_changed(bool p_visible, bool p_is_source)
for (int i = 0; i < get_child_count(); i++) { for (int i = 0; i < get_child_count(); i++) {
CanvasItem *c = Object::cast_to<CanvasItem>(get_child(i)); CanvasItem *c = Object::cast_to<CanvasItem>(get_child(i));
if (c) { // Should the top_levels stop propagation? I think so, but... if (c && c->visible) { //should the toplevels stop propagation? i think so but..
if (c->visible) {
c->_propagate_visibility_changed(p_visible); c->_propagate_visibility_changed(p_visible);
} else {
c->parent_visible_in_tree = p_visible;
}
} }
} }
@@ -392,14 +386,11 @@ void CanvasItem::set_visible(bool p_visible) {
visible = p_visible; visible = p_visible;
VisualServer::get_singleton()->canvas_item_set_visible(canvas_item, p_visible); VisualServer::get_singleton()->canvas_item_set_visible(canvas_item, p_visible);
if (!parent_visible_in_tree) { if (!is_inside_tree()) {
if (is_inside_tree()) {
notification(NOTIFICATION_VISIBILITY_CHANGED);
}
return; return;
} }
_propagate_visibility_changed(p_visible, true); _propagate_visibility_changed(p_visible, !p_visible);
_change_notify("visible"); _change_notify("visible");
} }

2
scene/2d/canvas_item.h
View File

@@ -210,7 +210,7 @@ private:
void _toplevel_raise_self(); void _toplevel_raise_self();
void _propagate_visibility_changed(bool p_visible, bool p_is_source = false); void _propagate_visibility_changed(bool p_visible, bool p_was_visible = false);
void _update_callback(); void _update_callback();

2
scene/main/canvas_layer.cpp
View File

@@ -59,7 +59,7 @@ void CanvasLayer::set_visible(bool p_visible) {
if (c->is_visible()) { if (c->is_visible()) {
c->_propagate_visibility_changed(p_visible); c->_propagate_visibility_changed(p_visible);
} else { } else {
c->parent_visible_in_tree = p_visible; c->notification(CanvasItem::NOTIFICATION_VISIBILITY_CHANGED);
} }
} }
} }