diff options
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/color_picker.cpp | 2 | ||||
| -rw-r--r-- | scene/gui/container.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp index 88710289c7..84170a65d1 100644 --- a/scene/gui/color_picker.cpp +++ b/scene/gui/color_picker.cpp @@ -66,7 +66,7 @@ void ColorPicker::_notification(int p_what) { } break; case NOTIFICATION_PARENTED: { for (int i = 0; i < 4; i++) { - set_margin((Margin)i, get_theme_constant("margin")); + set_margin((Margin)i, get_margin((Margin)i) + get_theme_constant("margin")); } } break; case NOTIFICATION_VISIBILITY_CHANGED: { diff --git a/scene/gui/container.cpp b/scene/gui/container.cpp index 18a84ce348..a89eef6209 100644 --- a/scene/gui/container.cpp +++ b/scene/gui/container.cpp @@ -140,7 +140,7 @@ void Container::queue_sort() { return; } - MessageQueue::get_singleton()->push_call(this, "_sort_children"); + MessageQueue::get_singleton()->push_callable(callable_mp(this, &Container::_sort_children)); pending_sort = true; } @@ -177,8 +177,6 @@ String Container::get_configuration_warning() const { } void Container::_bind_methods() { - ClassDB::bind_method(D_METHOD("_sort_children"), &Container::_sort_children); - ClassDB::bind_method(D_METHOD("queue_sort"), &Container::queue_sort); ClassDB::bind_method(D_METHOD("fit_child_in_rect", "child", "rect"), &Container::fit_child_in_rect); |