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

Fix invisible CanvasItem visibility issue

Browse Source
This commit is contained in:
Markus Sauermann
2022-02-22 01:13:32 +01:00
parent c77348b468
commit dce6cb7393
3 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
scene/main/canvas_item.cpp
View File

@@ -59,35 +59,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_parent_visible_in_tree) {
if (p_visible && first_draw) { // Avoid propagating it twice. parent_visible_in_tree = p_parent_visible_in_tree;
if (!visible) {
return;
}
if (p_parent_visible_in_tree && first_draw) { // Avoid propagating it twice.
first_draw = false; first_draw = false;
} }
if (!p_is_source) {
parent_visible_in_tree = p_visible;
}
notification(NOTIFICATION_VISIBILITY_CHANGED);
if (visible && p_visible) { _handle_visibility_change(p_parent_visible_in_tree);
update();
} else if (!p_visible && (visible || p_is_source)) {
emit_signal(SceneStringNames::get_singleton()->hidden);
}
_block();
for (int i = 0; i < get_child_count(); i++) {
CanvasItem *c = Object::cast_to<CanvasItem>(get_child(i));
if (c) { // Should the top_levels stop propagation? I think so, but...
if (c->visible) {
c->_propagate_visibility_changed(p_visible);
} else {
c->parent_visible_in_tree = p_visible;
}
}
}
_unblock();
} }
void CanvasItem::set_visible(bool p_visible) { void CanvasItem::set_visible(bool p_visible) {
@@ -96,14 +77,34 @@ void CanvasItem::set_visible(bool p_visible) {
} }
visible = p_visible; visible = p_visible;
RenderingServer::get_singleton()->canvas_item_set_visible(canvas_item, p_visible);
if (!parent_visible_in_tree) { if (!parent_visible_in_tree) {
notification(NOTIFICATION_VISIBILITY_CHANGED); notification(NOTIFICATION_VISIBILITY_CHANGED);
return; return;
} }
_propagate_visibility_changed(p_visible, true); _handle_visibility_change(p_visible);
}
void CanvasItem::_handle_visibility_change(bool p_visible) {
RenderingServer::get_singleton()->canvas_item_set_visible(canvas_item, p_visible);
notification(NOTIFICATION_VISIBILITY_CHANGED);
if (p_visible) {
update();
} else {
emit_signal(SceneStringNames::get_singleton()->hidden);
}
_block();
for (int i = 0; i < get_child_count(); i++) {
CanvasItem *c = Object::cast_to<CanvasItem>(get_child(i));
if (c) { // Should the top_levels stop propagation? I think so, but...
c->_propagate_visibility_changed(p_visible);
}
}
_unblock();
} }
void CanvasItem::show() { void CanvasItem::show() {

3
scene/main/canvas_item.h
View File

@@ -108,7 +108,8 @@ private:
void _top_level_raise_self(); void _top_level_raise_self();
void _propagate_visibility_changed(bool p_visible, bool p_is_source = false); void _propagate_visibility_changed(bool p_parent_visible_in_tree);
void _handle_visibility_change(bool p_visible);
void _update_callback(); void _update_callback();

6
scene/main/canvas_layer.cpp
View File

@@ -58,11 +58,7 @@ void CanvasLayer::set_visible(bool p_visible) {
if (c) { if (c) {
RenderingServer::get_singleton()->canvas_item_set_visible(c->get_canvas_item(), p_visible && c->is_visible()); RenderingServer::get_singleton()->canvas_item_set_visible(c->get_canvas_item(), p_visible && c->is_visible());
if (c->is_visible()) { c->_propagate_visibility_changed(p_visible);
c->_propagate_visibility_changed(p_visible);
} else {
c->parent_visible_in_tree = p_visible;
}
} }
} }
} }