1 files changed, 23 insertions, 32 deletions

diff --git a/scene/gui/container.cpp b/scene/gui/container.cpp
index b07fec90c2..a89eef6209 100644
--- a/scene/gui/container.cpp
+++ b/scene/gui/container.cpp
@@ -33,7 +33,6 @@
 #include "scene/scene_string_names.h"
 
 void Container::_child_minsize_changed() {
-
 	//Size2 ms = get_combined_minimum_size();
 	//if (ms.width > get_size().width || ms.height > get_size().height) {
 	minimum_size_changed();
@@ -41,52 +40,52 @@ void Container::_child_minsize_changed() {
 }
 
 void Container::add_child_notify(Node *p_child) {
-
 	Control::add_child_notify(p_child);
 
 	Control *control = Object::cast_to<Control>(p_child);
-	if (!control)
+	if (!control) {
 		return;
+	}
 
-	control->connect("size_flags_changed", this, "queue_sort");
-	control->connect("minimum_size_changed", this, "_child_minsize_changed");
-	control->connect("visibility_changed", this, "_child_minsize_changed");
+	control->connect("size_flags_changed", callable_mp(this, &Container::queue_sort));
+	control->connect("minimum_size_changed", callable_mp(this, &Container::_child_minsize_changed));
+	control->connect("visibility_changed", callable_mp(this, &Container::_child_minsize_changed));
 
 	minimum_size_changed();
 	queue_sort();
 }
 
 void Container::move_child_notify(Node *p_child) {
-
 	Control::move_child_notify(p_child);
 
-	if (!Object::cast_to<Control>(p_child))
+	if (!Object::cast_to<Control>(p_child)) {
 		return;
+	}
 
 	minimum_size_changed();
 	queue_sort();
 }
 
 void Container::remove_child_notify(Node *p_child) {
-
 	Control::remove_child_notify(p_child);
 
 	Control *control = Object::cast_to<Control>(p_child);
-	if (!control)
+	if (!control) {
 		return;
+	}
 
-	control->disconnect("size_flags_changed", this, "queue_sort");
-	control->disconnect("minimum_size_changed", this, "_child_minsize_changed");
-	control->disconnect("visibility_changed", this, "_child_minsize_changed");
+	control->disconnect("size_flags_changed", callable_mp(this, &Container::queue_sort));
+	control->disconnect("minimum_size_changed", callable_mp(this, &Container::_child_minsize_changed));
+	control->disconnect("visibility_changed", callable_mp(this, &Container::_child_minsize_changed));
 
 	minimum_size_changed();
 	queue_sort();
 }
 
 void Container::_sort_children() {
-
-	if (!is_inside_tree())
+	if (!is_inside_tree()) {
 		return;
+	}
 
 	notification(NOTIFICATION_SORT_CHILDREN);
 	emit_signal(SceneStringNames::get_singleton()->sort_children);
@@ -94,7 +93,6 @@ void Container::_sort_children() {
 }
 
 void Container::fit_child_in_rect(Control *p_child, const Rect2 &p_rect) {
-
 	ERR_FAIL_COND(!p_child);
 	ERR_FAIL_COND(p_child->get_parent() != this);
 
@@ -123,8 +121,9 @@ void Container::fit_child_in_rect(Control *p_child, const Rect2 &p_rect) {
 		}
 	}
 
-	for (int i = 0; i < 4; i++)
+	for (int i = 0; i < 4; i++) {
 		p_child->set_anchor(Margin(i), ANCHOR_BEGIN);
+	}
 
 	p_child->set_position(r.position);
 	p_child->set_size(r.size);
@@ -133,35 +132,31 @@ void Container::fit_child_in_rect(Control *p_child, const Rect2 &p_rect) {
 }
 
 void Container::queue_sort() {
-
-	if (!is_inside_tree())
+	if (!is_inside_tree()) {
 		return;
+	}
 
-	if (pending_sort)
+	if (pending_sort) {
 		return;
+	}
 
-	MessageQueue::get_singleton()->push_call(this, "_sort_children");
+	MessageQueue::get_singleton()->push_callable(callable_mp(this, &Container::_sort_children));
 	pending_sort = true;
 }
 
 void Container::_notification(int p_what) {
-
 	switch (p_what) {
-
 		case NOTIFICATION_ENTER_TREE: {
 			pending_sort = false;
 			queue_sort();
 		} break;
 		case NOTIFICATION_RESIZED: {
-
 			queue_sort();
 		} break;
 		case NOTIFICATION_THEME_CHANGED: {
-
 			queue_sort();
 		} break;
 		case NOTIFICATION_VISIBILITY_CHANGED: {
-
 			if (is_visible_in_tree()) {
 				queue_sort();
 			}
@@ -170,7 +165,6 @@ void Container::_notification(int p_what) {
 }
 
 String Container::get_configuration_warning() const {
-
 	String warning = Control::get_configuration_warning();
 
 	if (get_class() == "Container" && get_script().is_null()) {
@@ -183,10 +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("_child_minsize_changed"), &Container::_child_minsize_changed);
-
 	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);
 
@@ -195,6 +185,7 @@ void Container::_bind_methods() {
 }
 
 Container::Container() {
-
 	pending_sort = false;
+	// All containers should let mouse events pass by default.
+	set_mouse_filter(MOUSE_FILTER_PASS);
 }