godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19728 from Chaosus/theme_strings 

Changed themes presets to String format
This commit is contained in:
Rémi Verschelde 2018-06-25 16:39:23 +02:00 committed by GitHub
parent 4e867a1d7a f29f7bf0e7
commit baf85f299c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 49 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/editor_settings.cpp
View File

@ -313,8 +313,8 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
_initial_set("interface/editor/save_each_scene_on_quit", true); // Regression _initial_set("interface/editor/save_each_scene_on_quit", true); // Regression
_initial_set("interface/editor/quit_confirmation", true); _initial_set("interface/editor/quit_confirmation", true);
_initial_set("interface/theme/preset", 0); _initial_set("interface/theme/preset", "Default");
hints["interface/theme/preset"] = PropertyInfo(Variant::INT, "interface/theme/preset", PROPERTY_HINT_ENUM, "Default,Custom,Grey,Godot 2,Arc,Light,Alien,Solarized (Dark),Solarized (Light)", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED); hints["interface/theme/preset"] = PropertyInfo(Variant::STRING, "interface/theme/preset", PROPERTY_HINT_ENUM, "Default,Alien,Arc,Godot 2,Grey,Light,Solarized (Dark),Solarized (Light),Custom", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED);
_initial_set("interface/theme/icon_and_font_color", 0); _initial_set("interface/theme/icon_and_font_color", 0);
hints["interface/theme/icon_and_font_color"] = PropertyInfo(Variant::INT, "interface/theme/icon_and_font_color", PROPERTY_HINT_ENUM, "Auto,Dark,Light", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED); hints["interface/theme/icon_and_font_color"] = PropertyInfo(Variant::INT, "interface/theme/icon_and_font_color", PROPERTY_HINT_ENUM, "Auto,Dark,Light", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED);
_initial_set("interface/theme/base_color", Color::html("#323b4f")); _initial_set("interface/theme/base_color", Color::html("#323b4f"));

94
editor/editor_themes.cpp
View File

@ -254,7 +254,8 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
Color base_color = EDITOR_DEF("interface/theme/base_color", Color::html("#323b4f")); Color base_color = EDITOR_DEF("interface/theme/base_color", Color::html("#323b4f"));
float contrast = EDITOR_DEF("interface/theme/contrast", default_contrast); float contrast = EDITOR_DEF("interface/theme/contrast", default_contrast);
int preset = EDITOR_DEF("interface/theme/preset", 0); String preset = EDITOR_DEF("interface/theme/preset", "Default");
int icon_font_color_setting = EDITOR_DEF("interface/theme/icon_and_font_color", 0); int icon_font_color_setting = EDITOR_DEF("interface/theme/icon_and_font_color", 0);
bool highlight_tabs = EDITOR_DEF("interface/theme/highlight_tabs", false); bool highlight_tabs = EDITOR_DEF("interface/theme/highlight_tabs", false);
int border_size = EDITOR_DEF("interface/theme/border_size", 1); int border_size = EDITOR_DEF("interface/theme/border_size", 1);
@ -266,55 +267,52 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
Color preset_accent_color; Color preset_accent_color;
Color preset_base_color; Color preset_base_color;
float preset_contrast; float preset_contrast;
switch (preset) {
case 0: { // Default // Please, use alphabet order if you've added new theme here(After "Default" and "Custom")
preset_accent_color = Color::html("#699ce8");
preset_base_color = Color::html("#323b4f"); if (preset == "Default") {
preset_contrast = default_contrast; preset_accent_color = Color::html("#699ce8");
} break; preset_base_color = Color::html("#323b4f");
case 1: { // Custom preset_contrast = default_contrast;
accent_color = EDITOR_DEF("interface/theme/accent_color", Color::html("#699ce8")); } else if (preset == "Custom") {
base_color = EDITOR_DEF("interface/theme/base_color", Color::html("#323b4f")); accent_color = EDITOR_DEF("interface/theme/accent_color", Color::html("#699ce8"));
contrast = EDITOR_DEF("interface/theme/contrast", default_contrast); base_color = EDITOR_DEF("interface/theme/base_color", Color::html("#323b4f"));
} break; contrast = EDITOR_DEF("interface/theme/contrast", default_contrast);
case 2: { // Grey } else if (preset == "Alien") {
preset_accent_color = Color::html("#b8e4ff"); preset_accent_color = Color::html("#1bfe99");
preset_base_color = Color::html("#3d3d3d"); preset_base_color = Color::html("#2f373f");
preset_contrast = 0.2; preset_contrast = 0.25;
} break; } else if (preset == "Arc") {
case 3: { // Godot 2 preset_accent_color = Color::html("#5294e2");
preset_accent_color = Color::html("#86ace2"); preset_base_color = Color::html("#383c4a");
preset_base_color = Color::html("#3C3A44"); preset_contrast = 0.25;
preset_contrast = 0.25; } else if (preset == "Godot 2") {
} break; preset_accent_color = Color::html("#86ace2");
case 4: { // Arc preset_base_color = Color::html("#3C3A44");
preset_accent_color = Color::html("#5294e2"); preset_contrast = 0.25;
preset_base_color = Color::html("#383c4a"); } else if (preset == "Grey") {
preset_contrast = 0.25; preset_accent_color = Color::html("#b8e4ff");
} break; preset_base_color = Color::html("#3d3d3d");
case 5: { // Light preset_contrast = 0.2;
preset_accent_color = Color::html("#2070ff"); } else if (preset == "Light") {
preset_base_color = Color::html("#ffffff"); preset_accent_color = Color::html("#2070ff");
preset_contrast = 0.08; preset_base_color = Color::html("#ffffff");
} break; preset_contrast = 0.08;
case 6: { // Alien } else if (preset == "Solarized (Dark)") {
preset_accent_color = Color::html("#1bfe99"); preset_accent_color = Color::html("#268bd2");
preset_base_color = Color::html("#2f373f"); preset_base_color = Color::html("#073642");
preset_contrast = 0.25; preset_contrast = 0.15;
} break; } else if (preset == "Solarized (Light)") {
case 7: { // Solarized (Dark) preset_accent_color = Color::html("#268bd2");
preset_accent_color = Color::html("#268bd2"); preset_base_color = Color::html("#fdf6e3");
preset_base_color = Color::html("#073642"); preset_contrast = 0.06;
preset_contrast = 0.15; } else { // Default
} break; preset_accent_color = Color::html("#699ce8");
case 8: { // Solarized (Light) preset_base_color = Color::html("#323b4f");
preset_accent_color = Color::html("#268bd2"); preset_contrast = default_contrast;
preset_base_color = Color::html("#fdf6e3");
preset_contrast = 0.06;
} break;
} }
if (preset != 1) { if (preset != "Custom") {
accent_color = preset_accent_color; accent_color = preset_accent_color;
base_color = preset_base_color; base_color = preset_base_color;
contrast = preset_contrast; contrast = preset_contrast;

2
editor/settings_config_dialog.cpp
View File

@ -61,7 +61,7 @@ void EditorSettingsDialog::_settings_property_edited(const String &p_name) {
if (full_name == "text_editor/theme/color_theme") { if (full_name == "text_editor/theme/color_theme") {
property_editor->get_property_editor()->update_tree(); property_editor->get_property_editor()->update_tree();
} else if (full_name == "interface/theme/accent_color" || full_name == "interface/theme/base_color" || full_name == "interface/theme/contrast") { } else if (full_name == "interface/theme/accent_color" || full_name == "interface/theme/base_color" || full_name == "interface/theme/contrast") {
EditorSettings::get_singleton()->set_manually("interface/theme/preset", 1); // set preset to Custom EditorSettings::get_singleton()->set_manually("interface/theme/preset", "Custom"); // set preset to Custom
} else if (full_name.begins_with("text_editor/highlighting")) { } else if (full_name.begins_with("text_editor/highlighting")) {
EditorSettings::get_singleton()->set_manually("text_editor/theme/color_theme", "Custom"); EditorSettings::get_singleton()->set_manually("text_editor/theme/color_theme", "Custom");
} }