diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-05-27 11:25:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-27 11:25:43 +0200 |
| commit | 94edf16272df95a4d90ec3537f921c2fca20b903 (patch) | |
| tree | 8ba93e0d6b2823063a918d10f528f003b9c671cf | |
| parent | 2b25147450f5ae14a5b08fa7e70c8b7aa8f63742 (diff) | |
| parent | fa5aa11898d897cdacd344e1c5d503e485483d51 (diff) | |
Merge pull request #8929 from nunodonato/themecolors
Added color presets for easy theme switching
| -rw-r--r-- | editor/editor_settings.cpp | 6 | ||||
| -rw-r--r-- | editor/editor_themes.cpp | 26 |
2 files changed, 29 insertions, 3 deletions
diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index 858c38c796..df12c7c75f 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -511,9 +511,11 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) { set("interface/separate_distraction_mode", false); - set("interface/theme/base_color", Color(0.3, 0.3, 0.3, 1)); + set("interface/theme/preset", 0); + hints["interface/theme/preset"] = PropertyInfo(Variant::INT, "interface/theme/preset", PROPERTY_HINT_ENUM, "Default,Grey,Godot 2,Arc,Custom", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED); + set("interface/theme/base_color", Color::html("#273241")); hints["interface/theme/highlight_color"] = PropertyInfo(Variant::COLOR, "interface/theme/highlight_color", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED); - set("interface/theme/highlight_color", Color(0.5, 0.5, 0.6, 1)); + set("interface/theme/highlight_color", Color::html("#b79047")); hints["interface/theme/base_color"] = PropertyInfo(Variant::COLOR, "interface/theme/base_color", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED); set("interface/theme/contrast", 0.2); hints["interface/theme/contrast"] = PropertyInfo(Variant::REAL, "interface/theme/contrast", PROPERTY_HINT_RANGE, "0.01, 1, 0.01"); diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp index 9968b73044..bf15f43d32 100644 --- a/editor/editor_themes.cpp +++ b/editor/editor_themes.cpp @@ -96,8 +96,32 @@ Ref<Theme> create_editor_theme() { // Define colors Color highlight_color = EDITOR_DEF("interface/theme/highlight_color", Color::html("#b79047")); - Color base_color = EDITOR_DEF("interface/theme/base_color", Color::html("#213d4c")); + Color base_color = EDITOR_DEF("interface/theme/base_color", Color::html("#273241")); float contrast = EDITOR_DEF("interface/theme/contrast", 0.25); + int preset = EDITOR_DEF("interface/theme/preset", 0); + + switch (preset) { + case 0: { // Default + highlight_color = Color::html("#b79047"); + base_color = Color::html("#273241"); + contrast = 0.25; + } break; + case 1: { // Grey + highlight_color = Color::html("#3e3e3e"); + base_color = Color::html("#3d3d3d"); + contrast = 0.2; + } break; + case 2: { // Godot 2 + highlight_color = Color::html("#86ace2"); + base_color = Color::html("#3C3A44"); + contrast = 0.25; + } break; + case 3: { // Arc + highlight_color = Color::html("#68a7f2"); + base_color = Color::html("#434a59"); + contrast = 0.2; + } break; + } Color dark_color_1 = base_color.linear_interpolate(Color(0, 0, 0, 1), contrast); Color dark_color_2 = base_color.linear_interpolate(Color(0, 0, 0, 1), contrast * 1.5); |