godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Warn when setting Control size inside ready()"

Browse Source 
This reverts commit a8105d73c7.

We need to improve the logic somewhat to make the warning more specific to
actual problematic scenarios. Will likely be cherry-picked again + fixes
for the next release.

Fixes #46376.
This commit is contained in:
Rémi Verschelde 2021-02-25 15:00:49 +01:00
parent ea1d4256a4
commit 96d38d9751
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scene/gui/control.cpp
View File

@ -433,10 +433,6 @@ void Control::_resize(const Size2 &p_size) {
_size_changed(); _size_changed();
} }
void Control::_clear_size_warning() {
data.size_warning = false;
}
//moved theme configuration here, so controls can set up even if still not inside active scene //moved theme configuration here, so controls can set up even if still not inside active scene
void Control::add_child_notify(Node *p_child) { void Control::add_child_notify(Node *p_child) {
@ -488,9 +484,7 @@ void Control::_notification(int p_notification) {
case NOTIFICATION_EXIT_TREE: { case NOTIFICATION_EXIT_TREE: {
get_viewport()->_gui_remove_control(this); get_viewport()->_gui_remove_control(this);
} break;
case NOTIFICATION_READY: {
connect("ready", this, "_clear_size_warning", varray(), CONNECT_DEFERRED | CONNECT_ONESHOT);
} break; } break;
case NOTIFICATION_ENTER_CANVAS: { case NOTIFICATION_ENTER_CANVAS: {
@ -1835,11 +1829,6 @@ void Control::set_position(const Size2 &p_point, bool p_keep_margins) {
} }
void Control::_set_size(const Size2 &p_size) { void Control::_set_size(const Size2 &p_size) {
#ifdef DEBUG_ENABLED
if (data.size_warning) {
WARN_PRINT("Adjusting the size of Control nodes before they are fully initialized is unreliable. Consider deferring it with set_deferred().");
}
#endif
set_size(p_size); set_size(p_size);
} }
@ -2964,8 +2953,6 @@ void Control::_bind_methods() {
ClassDB::bind_method(D_METHOD("_override_changed"), &Control::_override_changed); ClassDB::bind_method(D_METHOD("_override_changed"), &Control::_override_changed);
ClassDB::bind_method(D_METHOD("_clear_size_warning"), &Control::_clear_size_warning);
BIND_VMETHOD(MethodInfo("_gui_input", PropertyInfo(Variant::OBJECT, "event", PROPERTY_HINT_RESOURCE_TYPE, "InputEvent"))); BIND_VMETHOD(MethodInfo("_gui_input", PropertyInfo(Variant::OBJECT, "event", PROPERTY_HINT_RESOURCE_TYPE, "InputEvent")));
BIND_VMETHOD(MethodInfo(Variant::VECTOR2, "_get_minimum_size")); BIND_VMETHOD(MethodInfo(Variant::VECTOR2, "_get_minimum_size"));

2
scene/gui/control.h
View File

@ -160,7 +160,6 @@ private:
float rotation; float rotation;
Vector2 scale; Vector2 scale;
Vector2 pivot_offset; Vector2 pivot_offset;
bool size_warning = true;
bool pending_resize; bool pending_resize;
@ -225,7 +224,6 @@ private:
void _change_notify_margins(); void _change_notify_margins();
void _update_minimum_size(); void _update_minimum_size();
void _clear_size_warning();
void _update_scroll(); void _update_scroll();
void _resize(const Size2 &p_size); void _resize(const Size2 &p_size);