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

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
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

View File

@@ -28,19 +28,17 @@
/*************************************************************************/
#include "panel_container.h"
Size2 PanelContainer::get_minimum_size() const {
Ref<StyleBox> style;
if (has_stylebox("panel"))
style=get_stylebox("panel");
style = get_stylebox("panel");
else
style=get_stylebox("panel","PanelContainer");
style = get_stylebox("panel", "PanelContainer");
Size2 ms;
for(int i=0;i<get_child_count();i++) {
for (int i = 0; i < get_child_count(); i++) {
Control *c = get_child(i)->cast_to<Control>();
if (!c || !c->is_visible())
@@ -49,53 +47,47 @@ Size2 PanelContainer::get_minimum_size() const {
continue;
Size2 minsize = c->get_combined_minimum_size();
ms.width = MAX(ms.width , minsize.width);
ms.height = MAX(ms.height , minsize.height);
ms.width = MAX(ms.width, minsize.width);
ms.height = MAX(ms.height, minsize.height);
}
if (style.is_valid())
ms+=style->get_minimum_size();
ms += style->get_minimum_size();
return ms;
}
void PanelContainer::_notification(int p_what) {
if (p_what==NOTIFICATION_DRAW) {
if (p_what == NOTIFICATION_DRAW) {
RID ci = get_canvas_item();
Ref<StyleBox> style;
if (has_stylebox("panel"))
style=get_stylebox("panel");
style = get_stylebox("panel");
else
style=get_stylebox("panel","PanelContainer");
style->draw( ci, Rect2( Point2(), get_size() ) );
style = get_stylebox("panel", "PanelContainer");
style->draw(ci, Rect2(Point2(), get_size()));
}
if (p_what==NOTIFICATION_SORT_CHILDREN) {
if (p_what == NOTIFICATION_SORT_CHILDREN) {
Ref<StyleBox> style;
if (has_stylebox("panel"))
style=get_stylebox("panel");
style = get_stylebox("panel");
else
style=get_stylebox("panel","PanelContainer");
style = get_stylebox("panel", "PanelContainer");
Size2 size = get_size();
Point2 ofs;
if (style.is_valid()) {
size-=style->get_minimum_size();
ofs+=style->get_offset();
size -= style->get_minimum_size();
ofs += style->get_offset();
}
for(int i=0;i<get_child_count();i++) {
for (int i = 0; i < get_child_count(); i++) {
Control *c = get_child(i)->cast_to<Control>();
if (!c || !c->is_visible())
@@ -103,12 +95,10 @@ void PanelContainer::_notification(int p_what) {
if (c->is_set_as_toplevel())
continue;
fit_child_in_rect(c,Rect2(ofs,size));
fit_child_in_rect(c, Rect2(ofs, size));
}
}
}
PanelContainer::PanelContainer()
{
PanelContainer::PanelContainer() {
}