godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-16 14:00:40 +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

40
editor/editor_themes.cpp
View File

@@ -28,41 +28,39 @@
/*************************************************************************/
#include "editor_themes.h"
#include "editor_icons.h"
#include "editor_fonts.h"
#include "editor_settings.h"
#include "core/io/resource_loader.h"
#include "editor_fonts.h"
#include "editor_icons.h"
#include "editor_settings.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);