From 95eb7466df890dcbed9eb8e8bda15bd9235db9c0 Mon Sep 17 00:00:00 2001
From: Juan Linietsky
Date: Sun, 11 Sep 2016 11:28:01 -0300
Subject: -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

---
 tools/editor/code_editor.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'tools/editor/code_editor.cpp')

diff --git a/tools/editor/code_editor.cpp b/tools/editor/code_editor.cpp
index 9bf7d05ae..9240e3527 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();
 	}
 }
-- 
cgit v1.2.3-70-g09d2