diff options
| author | Hein-Pieter van Braam <hp@tmm.cx> | 2017-09-14 09:05:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-14 09:05:31 +0200 |
| commit | 3f4062c7083d51c2d5375baee3a7e42bcd591e16 (patch) | |
| tree | 65632056e7195983c828f38e4fcbf3cabe417f2e /editor | |
| parent | bdb07fcf4d4fe1c7e35d26f373e85435c38f52d4 (diff) | |
| parent | 7a362afb88f2e71e4d0be7c3c9afb23f1447e5a1 (diff) | |
Merge pull request #11246 from djrm/pr_better_script_temperature
More consistent script color temperatures.
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_themes.cpp | 2 | ||||
| -rw-r--r-- | editor/plugins/script_editor_plugin.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp index cacd26a20a..25e1f0ecb8 100644 --- a/editor/editor_themes.cpp +++ b/editor/editor_themes.cpp @@ -285,6 +285,8 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { theme->set_color("contrast_color_1", "Editor", contrast_color_1); theme->set_color("contrast_color_2", "Editor", contrast_color_2); + theme->set_color("font_color", "Editor", font_color); + Color success_color = accent_color.linear_interpolate(Color(.6, 1, .6), 0.8); Color warning_color = accent_color.linear_interpolate(Color(1, 1, .2), 0.8); Color error_color = accent_color.linear_interpolate(Color(1, .2, .2), 0.8); diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index 6f03d086ca..fce9732919 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -1393,8 +1393,8 @@ void ScriptEditor::_update_script_colors() { bool highlight_current = EditorSettings::get_singleton()->get("text_editor/open_scripts/highlight_current_script"); int hist_size = EditorSettings::get_singleton()->get("text_editor/open_scripts/script_temperature_history_size"); - Color hot_color = EditorSettings::get_singleton()->get("text_editor/open_scripts/script_temperature_hot_color"); - Color cold_color = EditorSettings::get_singleton()->get("text_editor/open_scripts/script_temperature_cold_color"); + Color hot_color = get_color("accent_color", "Editor"); + Color cold_color = get_color("font_color", "Editor"); for (int i = 0; i < script_list->get_item_count(); i++) { @@ -2520,8 +2520,6 @@ ScriptEditorPlugin::ScriptEditorPlugin(EditorNode *p_node) { EDITOR_DEF("text_editor/open_scripts/script_temperature_enabled", true); EDITOR_DEF("text_editor/open_scripts/highlight_current_script", true); EDITOR_DEF("text_editor/open_scripts/script_temperature_history_size", 15); - EDITOR_DEF("text_editor/open_scripts/script_temperature_hot_color", Color::html("ed5e5e")); - EDITOR_DEF("text_editor/open_scripts/script_temperature_cold_color", Color(1, 1, 1, 0.3)); EDITOR_DEF("text_editor/open_scripts/current_script_background_color", Color(1, 1, 1, 0.5)); EDITOR_DEF("text_editor/open_scripts/group_help_pages", true); EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::INT, "text_editor/open_scripts/sort_scripts_by", PROPERTY_HINT_ENUM, "Name,Path")); |