From 43302837eb028ac0c27d0363a93e0bdb4dccde16 Mon Sep 17 00:00:00 2001 From: Marcel Admiraal Date: Tue, 8 Dec 2020 10:02:17 +0000 Subject: [PATCH] Rename CanvasItem's hide signal to hidden --- doc/classes/CanvasItem.xml | 2 +- scene/main/canvas_item.cpp | 4 ++-- scene/scene_string_names.cpp | 2 +- scene/scene_string_names.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/classes/CanvasItem.xml b/doc/classes/CanvasItem.xml index bd648c6de05..fcdd072c804 100644 --- a/doc/classes/CanvasItem.xml +++ b/doc/classes/CanvasItem.xml @@ -608,7 +608,7 @@ Emitted when the [CanvasItem] must redraw. This can only be connected realtime, as deferred will not allow drawing. - + Emitted when becoming hidden. diff --git a/scene/main/canvas_item.cpp b/scene/main/canvas_item.cpp index 6806a55151f..43350fae371 100644 --- a/scene/main/canvas_item.cpp +++ b/scene/main/canvas_item.cpp @@ -364,7 +364,7 @@ void CanvasItem::_propagate_visibility_changed(bool p_visible) { if (p_visible) { update(); //todo optimize } else { - emit_signal(SceneStringNames::get_singleton()->hide); + emit_signal(SceneStringNames::get_singleton()->hidden); } _block(); @@ -1227,7 +1227,7 @@ void CanvasItem::_bind_methods() { ADD_SIGNAL(MethodInfo("draw")); ADD_SIGNAL(MethodInfo("visibility_changed")); - ADD_SIGNAL(MethodInfo("hide")); + ADD_SIGNAL(MethodInfo("hidden")); ADD_SIGNAL(MethodInfo("item_rect_changed")); BIND_CONSTANT(NOTIFICATION_TRANSFORM_CHANGED); diff --git a/scene/scene_string_names.cpp b/scene/scene_string_names.cpp index c1dd59533d1..a72066e7a81 100644 --- a/scene/scene_string_names.cpp +++ b/scene/scene_string_names.cpp @@ -41,7 +41,7 @@ SceneStringNames::SceneStringNames() { doubledot = StaticCString::create(".."); draw = StaticCString::create("draw"); _draw = StaticCString::create("_draw"); - hide = StaticCString::create("hide"); + hidden = StaticCString::create("hidden"); visibility_changed = StaticCString::create("visibility_changed"); input_event = StaticCString::create("input_event"); shader = StaticCString::create("shader"); diff --git a/scene/scene_string_names.h b/scene/scene_string_names.h index 80ead560be9..b4d2429d7fb 100644 --- a/scene/scene_string_names.h +++ b/scene/scene_string_names.h @@ -58,7 +58,7 @@ public: StringName dot; StringName doubledot; StringName draw; - StringName hide; + StringName hidden; StringName visibility_changed; StringName input_event; StringName _input_event;