A Whole New World (clang-format edition)

I can show you the code
Pretty, with proper whitespace
Tell me, coder, now when did
You last write readable code?

I can open your eyes
Make you see your bad indent
Force you to respect the style
The core devs agreed upon

A whole new world
A new fantastic code format
A de facto standard
With some sugar
Enforced with clang-format

A whole new world
A dazzling style we all dreamed of
And when we read it through
It's crystal clear
That now we're in a whole new world of code

1 files changed, 77 insertions, 90 deletions

diff --git a/scene/gui/button.cpp b/scene/gui/button.cpp
index de2ccfb0b5..23915c51a8 100644
--- a/scene/gui/button.cpp
+++ b/scene/gui/button.cpp
@@ -27,86 +27,83 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "button.h"
-#include "servers/visual_server.h"
 #include "print_string.h"
+#include "servers/visual_server.h"
 #include "translation.h"
 
-
 Size2 Button::get_minimum_size() const {
 
-	Size2 minsize=get_font("font")->get_string_size( xl_text );
+	Size2 minsize = get_font("font")->get_string_size(xl_text);
 	if (clip_text)
-		minsize.width=0;
+		minsize.width = 0;
 
 	Ref<Texture> _icon;
 	if (icon.is_null() && has_icon("icon"))
-		_icon=Control::get_icon("icon");
+		_icon = Control::get_icon("icon");
 	else
-		_icon=icon;
+		_icon = icon;
 
 	if (!_icon.is_null()) {
 
-		minsize.height=MAX( minsize.height, _icon->get_height() );
-		minsize.width+=_icon->get_width();
-		if (xl_text!="")
-			minsize.width+=get_constant("hseparation");
+		minsize.height = MAX(minsize.height, _icon->get_height());
+		minsize.width += _icon->get_width();
+		if (xl_text != "")
+			minsize.width += get_constant("hseparation");
 	}
 
-	return get_stylebox("normal" )->get_minimum_size() + minsize;
-
+	return get_stylebox("normal")->get_minimum_size() + minsize;
 }
 
-
 void Button::_notification(int p_what) {
 
-	if (p_what==NOTIFICATION_TRANSLATION_CHANGED) {
+	if (p_what == NOTIFICATION_TRANSLATION_CHANGED) {
 
-		xl_text=XL_MESSAGE(text);
+		xl_text = XL_MESSAGE(text);
 		minimum_size_changed();
 		update();
 	}
 
-	if (p_what==NOTIFICATION_DRAW) {
+	if (p_what == NOTIFICATION_DRAW) {
 
 		RID ci = get_canvas_item();
-		Size2 size=get_size();
+		Size2 size = get_size();
 		Color color;
 
 		//print_line(get_text()+": "+itos(is_flat())+" hover "+itos(get_draw_mode()));
 
 		Ref<StyleBox> style = get_stylebox("normal");
 
-		switch( get_draw_mode() ) {
+		switch (get_draw_mode()) {
 
 			case DRAW_NORMAL: {
 
 				style = get_stylebox("normal");
 				if (!flat)
-					style->draw(  ci, Rect2(Point2(0,0), size) );
-				color=get_color("font_color");
+					style->draw(ci, Rect2(Point2(0, 0), size));
+				color = get_color("font_color");
 			} break;
 			case DRAW_PRESSED: {
 
 				style = get_stylebox("pressed");
-				style->draw(  ci, Rect2(Point2(0,0), size) );
+				style->draw(ci, Rect2(Point2(0, 0), size));
 				if (has_color("font_color_pressed"))
-					color=get_color("font_color_pressed");
+					color = get_color("font_color_pressed");
 				else
-					color=get_color("font_color");
+					color = get_color("font_color");
 
 			} break;
 			case DRAW_HOVER: {
 
 				style = get_stylebox("hover");
-				style->draw(  ci, Rect2(Point2(0,0), size) );
-				color=get_color("font_color_hover");
+				style->draw(ci, Rect2(Point2(0, 0), size));
+				color = get_color("font_color_hover");
 
 			} break;
 			case DRAW_DISABLED: {
 
 				style = get_stylebox("disabled");
-				style->draw(  ci, Rect2(Point2(0,0), size) );
-				color=get_color("font_color_disabled");
+				style->draw(ci, Rect2(Point2(0, 0), size));
+				color = get_color("font_color_disabled");
 
 			} break;
 		}
@@ -114,58 +111,54 @@ void Button::_notification(int p_what) {
 		if (has_focus()) {
 
 			Ref<StyleBox> style = get_stylebox("focus");
-			style->draw(ci,Rect2(Point2(),size));
+			style->draw(ci, Rect2(Point2(), size));
 		}
 
-		Ref<Font> font=get_font("font");
+		Ref<Font> font = get_font("font");
 		Ref<Texture> _icon;
 		if (icon.is_null() && has_icon("icon"))
-			_icon=Control::get_icon("icon");
+			_icon = Control::get_icon("icon");
 		else
-			_icon=icon;
+			_icon = icon;
 
-		Point2 icon_ofs = (!_icon.is_null())?Point2( _icon->get_width() + get_constant("hseparation"), 0):Point2();
-		int text_clip=size.width - style->get_minimum_size().width - icon_ofs.width;
-		Point2 text_ofs = (size - style->get_minimum_size() - icon_ofs - font->get_string_size( xl_text ) )/2.0;
+		Point2 icon_ofs = (!_icon.is_null()) ? Point2(_icon->get_width() + get_constant("hseparation"), 0) : Point2();
+		int text_clip = size.width - style->get_minimum_size().width - icon_ofs.width;
+		Point2 text_ofs = (size - style->get_minimum_size() - icon_ofs - font->get_string_size(xl_text)) / 2.0;
 
-		switch(align) {
+		switch (align) {
 			case ALIGN_LEFT: {
 				text_ofs.x = style->get_margin(MARGIN_LEFT) + icon_ofs.x;
-				text_ofs.y+=style->get_offset().y;
+				text_ofs.y += style->get_offset().y;
 			} break;
 			case ALIGN_CENTER: {
-				if (text_ofs.x<0)
-					text_ofs.x=0;
-				text_ofs+=icon_ofs;
-				text_ofs+=style->get_offset();
+				if (text_ofs.x < 0)
+					text_ofs.x = 0;
+				text_ofs += icon_ofs;
+				text_ofs += style->get_offset();
 			} break;
 			case ALIGN_RIGHT: {
-				text_ofs.x=size.x - style->get_margin(MARGIN_RIGHT) - font->get_string_size( xl_text ).x;
-				text_ofs.y+=style->get_offset().y;
+				text_ofs.x = size.x - style->get_margin(MARGIN_RIGHT) - font->get_string_size(xl_text).x;
+				text_ofs.y += style->get_offset().y;
 			} break;
 		}
 
-
-		text_ofs.y+=font->get_ascent();
-		font->draw( ci, text_ofs.floor(), xl_text, color,clip_text?text_clip:-1);
+		text_ofs.y += font->get_ascent();
+		font->draw(ci, text_ofs.floor(), xl_text, color, clip_text ? text_clip : -1);
 		if (!_icon.is_null()) {
 
-			int valign = size.height-style->get_minimum_size().y;
+			int valign = size.height - style->get_minimum_size().y;
 
-			_icon->draw(ci,style->get_offset()+Point2(0, Math::floor( (valign-_icon->get_height())/2.0 ) ),is_disabled()?Color(1,1,1,0.4):Color(1,1,1) );
+			_icon->draw(ci, style->get_offset() + Point2(0, Math::floor((valign - _icon->get_height()) / 2.0)), is_disabled() ? Color(1, 1, 1, 0.4) : Color(1, 1, 1));
 		}
-
-
-
 	}
 }
 
-void Button::set_text(const String& p_text) {
+void Button::set_text(const String &p_text) {
 
-	if (text==p_text)
+	if (text == p_text)
 		return;
-	text=p_text;
-	xl_text=XL_MESSAGE(p_text);
+	text = p_text;
+	xl_text = XL_MESSAGE(p_text);
 	update();
 	_change_notify("text");
 	minimum_size_changed();
@@ -175,12 +168,11 @@ String Button::get_text() const {
 	return text;
 }
 
+void Button::set_icon(const Ref<Texture> &p_icon) {
 
-void Button::set_icon(const Ref<Texture>& p_icon) {
-
-	if (icon==p_icon)
+	if (icon == p_icon)
 		return;
-	icon=p_icon;
+	icon = p_icon;
 	update();
 	_change_notify("icon");
 	minimum_size_changed();
@@ -193,7 +185,7 @@ Ref<Texture> Button::get_icon() const {
 
 void Button::set_flat(bool p_flat) {
 
-	flat=p_flat;
+	flat = p_flat;
 	update();
 	_change_notify("flat");
 }
@@ -205,7 +197,7 @@ bool Button::is_flat() const {
 
 void Button::set_clip_text(bool p_clip_text) {
 
-	clip_text=p_clip_text;
+	clip_text = p_clip_text;
 	update();
 	minimum_size_changed();
 }
@@ -217,7 +209,7 @@ bool Button::get_clip_text() const {
 
 void Button::set_text_align(TextAlign p_align) {
 
-	align=p_align;
+	align = p_align;
 	update();
 }
 
@@ -228,41 +220,36 @@ Button::TextAlign Button::get_text_align() const {
 
 void Button::_bind_methods() {
 
-	ClassDB::bind_method(D_METHOD("set_text","text"),&Button::set_text);
-	ClassDB::bind_method(D_METHOD("get_text"),&Button::get_text);
-	ClassDB::bind_method(D_METHOD("set_button_icon","texture:Texture"),&Button::set_icon);
-	ClassDB::bind_method(D_METHOD("get_button_icon:Texture"),&Button::get_icon);
-	ClassDB::bind_method(D_METHOD("set_flat","enabled"),&Button::set_flat);
-	ClassDB::bind_method(D_METHOD("set_clip_text","enabled"),&Button::set_clip_text);
-	ClassDB::bind_method(D_METHOD("get_clip_text"),&Button::get_clip_text);
-	ClassDB::bind_method(D_METHOD("set_text_align","align"),&Button::set_text_align);
-	ClassDB::bind_method(D_METHOD("get_text_align"),&Button::get_text_align);
-	ClassDB::bind_method(D_METHOD("is_flat"),&Button::is_flat);
-
-	BIND_CONSTANT( ALIGN_LEFT );
-	BIND_CONSTANT( ALIGN_CENTER );
-	BIND_CONSTANT( ALIGN_RIGHT );
-
-	ADD_PROPERTYNZ( PropertyInfo( Variant::STRING, "text", PROPERTY_HINT_NONE,"",PROPERTY_USAGE_DEFAULT_INTL ), "set_text","get_text") ;
-	ADD_PROPERTYNZ( PropertyInfo( Variant::OBJECT, "icon", PROPERTY_HINT_RESOURCE_TYPE, "Texture" ), "set_button_icon","get_button_icon") ;
-	ADD_PROPERTY( PropertyInfo( Variant::BOOL, "flat" ), "set_flat","is_flat") ;
-	ADD_PROPERTYNZ( PropertyInfo( Variant::BOOL, "clip_text" ), "set_clip_text","get_clip_text") ;
-	ADD_PROPERTYNO( PropertyInfo( Variant::INT, "align",PROPERTY_HINT_ENUM,"Left,Center,Right" ), "set_text_align","get_text_align") ;
-
+	ClassDB::bind_method(D_METHOD("set_text", "text"), &Button::set_text);
+	ClassDB::bind_method(D_METHOD("get_text"), &Button::get_text);
+	ClassDB::bind_method(D_METHOD("set_button_icon", "texture:Texture"), &Button::set_icon);
+	ClassDB::bind_method(D_METHOD("get_button_icon:Texture"), &Button::get_icon);
+	ClassDB::bind_method(D_METHOD("set_flat", "enabled"), &Button::set_flat);
+	ClassDB::bind_method(D_METHOD("set_clip_text", "enabled"), &Button::set_clip_text);
+	ClassDB::bind_method(D_METHOD("get_clip_text"), &Button::get_clip_text);
+	ClassDB::bind_method(D_METHOD("set_text_align", "align"), &Button::set_text_align);
+	ClassDB::bind_method(D_METHOD("get_text_align"), &Button::get_text_align);
+	ClassDB::bind_method(D_METHOD("is_flat"), &Button::is_flat);
+
+	BIND_CONSTANT(ALIGN_LEFT);
+	BIND_CONSTANT(ALIGN_CENTER);
+	BIND_CONSTANT(ALIGN_RIGHT);
+
+	ADD_PROPERTYNZ(PropertyInfo(Variant::STRING, "text", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT_INTL), "set_text", "get_text");
+	ADD_PROPERTYNZ(PropertyInfo(Variant::OBJECT, "icon", PROPERTY_HINT_RESOURCE_TYPE, "Texture"), "set_button_icon", "get_button_icon");
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "flat"), "set_flat", "is_flat");
+	ADD_PROPERTYNZ(PropertyInfo(Variant::BOOL, "clip_text"), "set_clip_text", "get_clip_text");
+	ADD_PROPERTYNO(PropertyInfo(Variant::INT, "align", PROPERTY_HINT_ENUM, "Left,Center,Right"), "set_text_align", "get_text_align");
 }
 
 Button::Button(const String &p_text) {
 
-	flat=false;
-	clip_text=false;
+	flat = false;
+	clip_text = false;
 	set_mouse_filter(MOUSE_FILTER_STOP);
 	set_text(p_text);
-	align=ALIGN_CENTER;
+	align = ALIGN_CENTER;
 }
 
-
-Button::~Button()
-{
+Button::~Button() {
 }
-
-