godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-12 13:20:55 +00:00
Code Releases Wiki Activity

Removed duplicate default colours and removed GDScriptHighligher colours from main editor.

Browse Source
This commit is contained in:
Paulb23
2018-06-10 15:30:49 +01:00
parent 8f7e791ab6
commit 08c036b706
4 changed files with 46 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/gdscript/editor/gdscript_highlighter.cpp
View File

@@ -312,8 +312,24 @@ void GDScriptSyntaxHighlighter::_update_cache() {
number_color = text_editor->get_color("number_color");
member_color = text_editor->get_color("member_variable_color");
function_definition_color = EDITOR_DEF("text_editor/highlighting/gdscript/function_definition_color", Color::html("#01e1ff"));
node_path_color = EDITOR_DEF("text_editor/highlighting/gdscript/node_path_color", Color::html("#64c15a"));
EditorSettings *settings = EditorSettings::get_singleton();
String text_editor_color_theme = settings->get("text_editor/theme/color_theme");
bool default_theme = text_editor_color_theme == "Default";
bool dark_theme = settings->is_dark_theme();
function_definition_color = Color::html(default_theme ? "#01e1ff" : dark_theme ? "#01e1ff" : "#00a5ba");
node_path_color = Color::html(default_theme ? "#64c15a" : dark_theme ? "64c15a" : "#518b4b");
EDITOR_DEF("text_editor/highlighting/gdscript/function_definition_color", function_definition_color);
EDITOR_DEF("text_editor/highlighting/gdscript/node_path_color", node_path_color);
if (text_editor_color_theme == "Adaptive" || default_theme) {
settings->set_initial_value("text_editor/highlighting/gdscript/function_definition_color", function_definition_color, true);
settings->set_initial_value("text_editor/highlighting/gdscript/node_path_color", node_path_color, true);
}
function_definition_color = EDITOR_GET("text_editor/highlighting/gdscript/function_definition_color");
node_path_color = EDITOR_GET("text_editor/highlighting/gdscript/node_path_color");
}
SyntaxHighlighter *GDScriptSyntaxHighlighter::create() {