asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Warn when setting Control size inside ready()

Browse source 
(cherry picked from commit 84da090a69)
This commit is contained in:
Tomasz Chabora 2020-09-30 12:00:21 +02:00 committed by Rémi Verschelde
parent cefaa6fb06
commit a8105d73c7
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
scene/gui/control.cpp
View file

@ -433,6 +433,10 @@ void Control::_resize(const Size2 &p_size) {
_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
void Control::add_child_notify(Node *p_child) {
@ -484,7 +488,9 @@ void Control::_notification(int p_notification) {
case NOTIFICATION_EXIT_TREE: {
get_viewport()->_gui_remove_control(this);
} break;
case NOTIFICATION_READY: {
connect("ready", this, "_clear_size_warning", varray(), CONNECT_DEFERRED | CONNECT_ONESHOT);
} break;
case NOTIFICATION_ENTER_CANVAS: {
@ -1829,6 +1835,11 @@ void Control::set_position(const Size2 &p_point, bool p_keep_margins) {
}
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);
}
@ -2953,6 +2964,8 @@ void Control::_bind_methods() {
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(Variant::VECTOR2, "_get_minimum_size"));

2
scene/gui/control.h
View file

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