godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-17 14:11:06 +00:00
Code Releases Wiki Activity

Bring that Whole New World to the Old Continent too

Browse Source 
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6.
This commit is contained in:
Rémi Verschelde
2017-03-19 00:36:26 +01:00
parent 1d418afe86
commit f8db8a3faa
1308 changed files with 147754 additions and 174357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
scene/gui/container.cpp
View File

@@ -27,9 +27,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "container.h"
#include "scene/scene_string_names.h"
#include "message_queue.h"
#include "scene/scene_string_names.h"
void Container::_child_minsize_changed() {
@@ -45,11 +44,10 @@ void Container::add_child_notify(Node *p_child) {
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", this, "queue_sort");
control->connect("minimum_size_changed", this, "_child_minsize_changed");
control->connect("visibility_changed", this, "_child_minsize_changed");
queue_sort();
}
void Container::move_child_notify(Node *p_child) {
@@ -62,14 +60,13 @@ void Container::move_child_notify(Node *p_child) {
void Container::remove_child_notify(Node *p_child) {
Control *control = p_child->cast_to<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", this, "queue_sort");
control->disconnect("minimum_size_changed", this, "_child_minsize_changed");
control->disconnect("visibility_changed", this, "_child_minsize_changed");
queue_sort();
}
@@ -80,33 +77,33 @@ void Container::_sort_children() {
notification(NOTIFICATION_SORT_CHILDREN);
emit_signal(SceneStringNames::get_singleton()->sort_children);
pending_sort=false;
pending_sort = false;
}
void Container::fit_child_in_rect(Control *p_child,const Rect2& p_rect) {
void Container::fit_child_in_rect(Control *p_child, const Rect2 &p_rect) {
ERR_FAIL_COND(p_child->get_parent()!=this);
ERR_FAIL_COND(p_child->get_parent() != this);
Size2 minsize = p_child->get_combined_minimum_size();
Rect2 r=p_rect;
Rect2 r = p_rect;
if (!(p_child->get_h_size_flags()&SIZE_FILL)) {
r.size.x=minsize.x;
r.pos.x += Math::floor((p_rect.size.x - minsize.x)/2);
if (!(p_child->get_h_size_flags() & SIZE_FILL)) {
r.size.x = minsize.x;
r.pos.x += Math::floor((p_rect.size.x - minsize.x) / 2);
}
if (!(p_child->get_v_size_flags()&SIZE_FILL)) {
r.size.y=minsize.y;
r.pos.y += Math::floor((p_rect.size.y - minsize.y)/2);
if (!(p_child->get_v_size_flags() & SIZE_FILL)) {
r.size.y = minsize.y;
r.pos.y += Math::floor((p_rect.size.y - minsize.y) / 2);
}
for(int i=0;i<4;i++)
p_child->set_anchor(Margin(i),ANCHOR_BEGIN);
for (int i = 0; i < 4; i++)
p_child->set_anchor(Margin(i), ANCHOR_BEGIN);
p_child->set_pos(r.pos);
p_child->set_size(r.size);
p_child->set_rotation(0);
p_child->set_scale(Vector2(1,1));
p_child->set_scale(Vector2(1, 1));
}
void Container::queue_sort() {
@@ -117,16 +114,16 @@ void Container::queue_sort() {
if (pending_sort)
return;
MessageQueue::get_singleton()->push_call(this,"_sort_children");
pending_sort=true;
MessageQueue::get_singleton()->push_call(this, "_sort_children");
pending_sort = true;
}
void Container::_notification(int p_what) {
switch(p_what) {
switch (p_what) {
case NOTIFICATION_ENTER_TREE: {
pending_sort=false;
pending_sort = false;
queue_sort();
} break;
case NOTIFICATION_RESIZED: {
@@ -148,17 +145,17 @@ void Container::_notification(int p_what) {
void Container::_bind_methods() {
ObjectTypeDB::bind_method(_MD("_sort_children"),&Container::_sort_children);
ObjectTypeDB::bind_method(_MD("_child_minsize_changed"),&Container::_child_minsize_changed);
ObjectTypeDB::bind_method(_MD("_sort_children"), &Container::_sort_children);
ObjectTypeDB::bind_method(_MD("_child_minsize_changed"), &Container::_child_minsize_changed);
ObjectTypeDB::bind_method(_MD("queue_sort"),&Container::queue_sort);
ObjectTypeDB::bind_method(_MD("fit_child_in_rect","child:Control","rect"),&Container::fit_child_in_rect);
ObjectTypeDB::bind_method(_MD("queue_sort"), &Container::queue_sort);
ObjectTypeDB::bind_method(_MD("fit_child_in_rect", "child:Control", "rect"), &Container::fit_child_in_rect);
BIND_CONSTANT( NOTIFICATION_SORT_CHILDREN );
BIND_CONSTANT(NOTIFICATION_SORT_CHILDREN);
ADD_SIGNAL(MethodInfo("sort_children"));
}
Container::Container() {
pending_sort=false;
pending_sort = false;
}