diff options
author | Juan Linietsky <reduzio@gmail.com> | 2016-09-11 11:28:01 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2016-09-11 11:28:01 -0300 |
commit | 95eb7466df890dcbed9eb8e8bda15bd9235db9c0 (patch) | |
tree | 6c23afb3abef8e539c42d1024a0fa213bc98692b /tools/editor/code_editor.cpp | |
parent | 1bf684cea274db7c58b3f62a77ad4de3980c14dc (diff) | |
download | redot-engine-95eb7466df890dcbed9eb8e8bda15bd9235db9c0.tar.gz |
-Added a ColorFrame control, kind of like Texture but for color.
-Added dropping nodes to text editor for them to become a path
-Fixed issues with font not properly being set in code editor
Diffstat (limited to 'tools/editor/code_editor.cpp')
-rw-r--r-- | tools/editor/code_editor.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/editor/code_editor.cpp b/tools/editor/code_editor.cpp index 9bf7d05ae8..9240e3527c 100644 --- a/tools/editor/code_editor.cpp +++ b/tools/editor/code_editor.cpp @@ -1128,8 +1128,10 @@ void CodeTextEditor::_update_font() { font_overridden = true; } } - if(!font_overridden) + if(!font_overridden) { + text_editor->add_font_override("font",get_font("source","EditorFonts")); + } } void CodeTextEditor::_on_settings_change() { @@ -1168,7 +1170,7 @@ void CodeTextEditor::_notification(int p_what) { _load_theme_settings(); emit_signal("load_theme_settings"); } - if (p_what==NOTIFICATION_ENTER_TREE) { + if (p_what==NOTIFICATION_THEME_CHANGED) { _update_font(); } } |