noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #56734 from hinlopen/showhide

Browse Source 
Minor code improvement in CanvasItem (show/hide/set_visible)
This commit is contained in:
Rémi Verschelde
2022-01-13 00:01:34 +01:00
committed by GitHub
parent 586a973b6b fb1cd9e446
commit 2f4d76f068
1 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
scene/main/canvas_item.cpp
View File

@@ -99,34 +99,31 @@ void CanvasItem::_propagate_visibility_changed(bool p_visible) {
_unblock();
}
void CanvasItem::show() {
if (visible) {
void CanvasItem::set_visible(bool p_visible) {
if (visible == p_visible) {
return;
}
visible = true;
RenderingServer::get_singleton()->canvas_item_set_visible(canvas_item, true);
visible = p_visible;
RenderingServer::get_singleton()->canvas_item_set_visible(canvas_item, p_visible);
if (!is_inside_tree()) {
return;
}
_propagate_visibility_changed(true);
_propagate_visibility_changed(p_visible);
}
void CanvasItem::show() {
set_visible(true);
}
void CanvasItem::hide() {
if (!visible) {
return;
}
set_visible(false);
}
visible = false;
RenderingServer::get_singleton()->canvas_item_set_visible(canvas_item, false);
if (!is_inside_tree()) {
return;
}
_propagate_visibility_changed(false);
bool CanvasItem::is_visible() const {
return visible;
}
CanvasItem *CanvasItem::current_item_drawn = nullptr;
@@ -348,24 +345,12 @@ void CanvasItem::_notification(int p_what) {
}
}
void CanvasItem::set_visible(bool p_visible) {
if (p_visible) {
show();
} else {
hide();
}
}
void CanvasItem::_window_visibility_changed() {
if (visible) {
_propagate_visibility_changed(window->is_visible());
}
}
bool CanvasItem::is_visible() const {
return visible;
}
void CanvasItem::update() {
if (!is_inside_tree()) {
return;