diff options
| author | Rémi Verschelde | 2017-03-05 16:44:50 +0100 |
|---|---|---|
| committer | Rémi Verschelde | 2017-03-05 16:44:50 +0100 |
| commit | 5dbf1809c6e3e905b94b8764e99491e608122261 (patch) | |
| tree | 5e5a5360db15d86d59ec8c6e4f7eb511388c5a9a /editor/editor_themes.cpp | |
| parent | 45438e9918d421b244bfd7776a30e67dc7f2d3e3 (diff) | |
| download | godot-5dbf180.tar.gz godot-5dbf180.tar.zst godot-5dbf180.zip | |
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
Diffstat (limited to 'editor/editor_themes.cpp')
| -rw-r--r-- | editor/editor_themes.cpp | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp index 7657996b8..adb4c8162 100644 --- a/editor/editor_themes.cpp +++ b/editor/editor_themes.cpp @@ -28,47 +28,45 @@ /*************************************************************************/ #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_scale.h" +#include "editor_settings.h" -Ref<Theme> create_editor_theme() -{ - Ref<Theme> theme = Ref<Theme>( memnew( Theme ) ); +Ref<Theme> create_editor_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*EDSCALE); - focus_sbt->set_default_margin(Margin(i),16*EDSCALE); + 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 * EDSCALE); + focus_sbt->set_default_margin(Margin(i), 16 * EDSCALE); } 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_custom_theme() -{ +Ref<Theme> create_custom_theme() { Ref<Theme> theme; String custom_theme = EditorSettings::get_singleton()->get("interface/custom_theme"); - if (custom_theme!="") { + if (custom_theme != "") { theme = ResourceLoader::load(custom_theme); } String global_font = EditorSettings::get_singleton()->get("interface/custom_font"); - if (global_font!="") { + if (global_font != "") { Ref<Font> fnt = ResourceLoader::load(global_font); if (fnt.is_valid()) { if (!theme.is_valid()) { |
