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.
---
 editor/editor_themes.cpp | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

(limited to 'editor/editor_themes.cpp')

diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp
index 433a5dfd7..e0f685f98 100644
--- a/editor/editor_themes.cpp
+++ b/editor/editor_themes.cpp
@@ -28,41 +28,39 @@
 /*************************************************************************/
 
 #include "editor_themes.h"
-#include "editor_icons.h"
+#include "core/io/resource_loader.h"
 #include "editor_fonts.h"
+#include "editor_icons.h"
 #include "editor_settings.h"
-#include "core/io/resource_loader.h"
 
-Ref<Theme> create_default_theme()
-{
-	Ref<Theme> theme = Ref<Theme>( memnew( Theme ) );
+Ref<Theme> create_default_theme() {
+	Ref<Theme> theme = Ref<Theme>(memnew(Theme));
 
 	editor_register_fonts(theme);
 	editor_register_icons(theme);
 
-	Ref<StyleBoxTexture> focus_sbt=memnew( StyleBoxTexture );
-	focus_sbt->set_texture(theme->get_icon("EditorFocus","EditorIcons"));
-	for(int i=0;i<4;i++) {
-		focus_sbt->set_margin_size(Margin(i),16);
-		focus_sbt->set_default_margin(Margin(i),16);
+	Ref<StyleBoxTexture> focus_sbt = memnew(StyleBoxTexture);
+	focus_sbt->set_texture(theme->get_icon("EditorFocus", "EditorIcons"));
+	for (int i = 0; i < 4; i++) {
+		focus_sbt->set_margin_size(Margin(i), 16);
+		focus_sbt->set_default_margin(Margin(i), 16);
 	}
 	focus_sbt->set_draw_center(false);
-	theme->set_stylebox("EditorFocus","EditorStyles",focus_sbt);
-	theme->set_color("prop_category","Editor",Color::hex(0x3f3a44ff));
-	theme->set_color("prop_section","Editor",Color::hex(0x35313aff));
-	theme->set_color("prop_subsection","Editor",Color::hex(0x312e37ff));
-	theme->set_color("fg_selected","Editor",Color::html("ffbd8e8e"));
-	theme->set_color("fg_error","Editor",Color::html("ffbd8e8e"));
+	theme->set_stylebox("EditorFocus", "EditorStyles", focus_sbt);
+	theme->set_color("prop_category", "Editor", Color::hex(0x3f3a44ff));
+	theme->set_color("prop_section", "Editor", Color::hex(0x35313aff));
+	theme->set_color("prop_subsection", "Editor", Color::hex(0x312e37ff));
+	theme->set_color("fg_selected", "Editor", Color::html("ffbd8e8e"));
+	theme->set_color("fg_error", "Editor", Color::html("ffbd8e8e"));
 
 	return theme;
 }
 
-Ref<Theme> create_editor_theme()
-{
+Ref<Theme> create_editor_theme() {
 	Ref<Theme> theme = NULL;
 
 	String custom_theme = EditorSettings::get_singleton()->get("global/custom_theme");
-	if (custom_theme!="") {
+	if (custom_theme != "") {
 		theme = ResourceLoader::load(custom_theme);
 	}
 
@@ -71,7 +69,7 @@ Ref<Theme> create_editor_theme()
 	}
 
 	String global_font = EditorSettings::get_singleton()->get("global/custom_font");
-	if (global_font!="") {
+	if (global_font != "") {
 		Ref<Font> fnt = ResourceLoader::load(global_font);
 		if (fnt.is_valid()) {
 			theme->set_default_theme_font(fnt);
-- 
cgit v1.2.3-70-g09d2