From f8db8a3faa30b71dca33ced38be16d3f93f43e8a Mon Sep 17 00:00:00 2001 From: Rémi Verschelde Date: Sun, 19 Mar 2017 00:36:26 +0100 Subject: Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261. --- scene/gui/margin_container.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'scene/gui/margin_container.cpp') diff --git a/scene/gui/margin_container.cpp b/scene/gui/margin_container.cpp index 883364b2f..495af8adf 100644 --- a/scene/gui/margin_container.cpp +++ b/scene/gui/margin_container.cpp @@ -28,7 +28,6 @@ /*************************************************************************/ #include "margin_container.h" - Size2 MarginContainer::get_minimum_size() const { int margin_left = get_constant("margin_left"); @@ -38,7 +37,7 @@ Size2 MarginContainer::get_minimum_size() const { Size2 max; - for(int i=0;icast_to(); if (!c) @@ -59,12 +58,11 @@ Size2 MarginContainer::get_minimum_size() const { max.height += (margin_top + margin_bottom); return max; - } void MarginContainer::_notification(int p_what) { - if (p_what==NOTIFICATION_SORT_CHILDREN) { + if (p_what == NOTIFICATION_SORT_CHILDREN) { int margin_left = get_constant("margin_left"); int margin_top = get_constant("margin_top"); @@ -73,7 +71,7 @@ void MarginContainer::_notification(int p_what) { Size2 s = get_size(); - for(int i=0;icast_to(); if (!c) @@ -81,14 +79,12 @@ void MarginContainer::_notification(int p_what) { if (c->is_set_as_toplevel()) continue; - int w=s.width-margin_left-margin_right; - int h=s.height-margin_top-margin_bottom; - fit_child_in_rect(c,Rect2(margin_left,margin_top,w,h)); + int w = s.width - margin_left - margin_right; + int h = s.height - margin_top - margin_bottom; + fit_child_in_rect(c, Rect2(margin_left, margin_top, w, h)); } - } } -MarginContainer::MarginContainer() -{ +MarginContainer::MarginContainer() { } -- cgit v1.3.1