asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

setted font bug fix

Browse source
This commit is contained in:
jonyrock 2014-05-01 01:58:26 +04:00
parent bb853d121e
commit 34aea718b1
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tools/editor/code_editor.cpp
View file

@ -511,21 +511,25 @@ void CodeTextEditor::set_error(const String& p_error) {
} }
void CodeTextEditor::_on_settings_change() { void CodeTextEditor::_on_settings_change() {
String editor_font = EditorSettings::get_singleton()->get("text_editor/font"); // FONTS
String editor_font = EDITOR_DEF("text_editor/font", "");
bool font_overrode = false;
if (editor_font!="") { if (editor_font!="") {
Ref<Font> fnt = ResourceLoader::load(editor_font); Ref<Font> fnt = ResourceLoader::load(editor_font);
if (fnt.is_valid()) { if (fnt.is_valid()) {
text_editor->add_font_override("font",fnt); text_editor->add_font_override("font",fnt);
return; font_overrode = true;
} }
} }
if(!font_overrode)
text_editor->add_font_override("font",get_font("source","Fonts")); text_editor->add_font_override("font",get_font("source","Fonts"));
// AUTO BRACE COMPLETION
text_editor->set_auto_brace_completion( text_editor->set_auto_brace_completion(
EDITOR_DEF("text_editor/auto_brace_complete", false) EDITOR_DEF("text_editor/auto_brace_complete", false)
); );
} }
void CodeTextEditor::_text_changed_idle_timeout() { void CodeTextEditor::_text_changed_idle_timeout() {