Browse Source

Merge pull request #31114 from merumelu/editornode-begone

Remove Editor dependency from SceneTree
Rémi Verschelde 6 years ago
parent
commit
e490c16a3d
2 changed files with 7 additions and 15 deletions
  1. 5 0
      editor/editor_node.cpp
  2. 2 15
      scene/main/scene_tree.cpp

+ 5 - 0
editor/editor_node.cpp

@@ -334,6 +334,11 @@ void EditorNode::_notification(int p_what) {
 			OS::get_singleton()->set_low_processor_usage_mode_sleep_usec(int(EDITOR_GET("interface/editor/unfocused_low_processor_mode_sleep_usec")));
 			OS::get_singleton()->set_low_processor_usage_mode_sleep_usec(int(EDITOR_GET("interface/editor/unfocused_low_processor_mode_sleep_usec")));
 		} break;
 		} break;
 
 
+		case MainLoop::NOTIFICATION_WM_ABOUT: {
+
+			show_about();
+		} break;
+
 		case MainLoop::NOTIFICATION_WM_QUIT_REQUEST: {
 		case MainLoop::NOTIFICATION_WM_QUIT_REQUEST: {
 
 
 			_menu_option_confirm(FILE_QUIT, false);
 			_menu_option_confirm(FILE_QUIT, false);

+ 2 - 15
scene/main/scene_tree.cpp

@@ -37,7 +37,6 @@
 #include "core/os/os.h"
 #include "core/os/os.h"
 #include "core/print_string.h"
 #include "core/print_string.h"
 #include "core/project_settings.h"
 #include "core/project_settings.h"
-#include "editor/editor_node.h"
 #include "main/input_default.h"
 #include "main/input_default.h"
 #include "node.h"
 #include "node.h"
 #include "scene/resources/dynamic_font.h"
 #include "scene/resources/dynamic_font.h"
@@ -647,7 +646,8 @@ void SceneTree::_notification(int p_notification) {
 		case NOTIFICATION_WM_MOUSE_ENTER:
 		case NOTIFICATION_WM_MOUSE_ENTER:
 		case NOTIFICATION_WM_MOUSE_EXIT:
 		case NOTIFICATION_WM_MOUSE_EXIT:
 		case NOTIFICATION_WM_FOCUS_IN:
 		case NOTIFICATION_WM_FOCUS_IN:
-		case NOTIFICATION_WM_FOCUS_OUT: {
+		case NOTIFICATION_WM_FOCUS_OUT:
+		case NOTIFICATION_WM_ABOUT: {
 
 
 			if (p_notification == NOTIFICATION_WM_FOCUS_IN) {
 			if (p_notification == NOTIFICATION_WM_FOCUS_IN) {
 				InputDefault *id = Object::cast_to<InputDefault>(Input::get_singleton());
 				InputDefault *id = Object::cast_to<InputDefault>(Input::get_singleton());
@@ -671,19 +671,6 @@ void SceneTree::_notification(int p_notification) {
 
 
 		} break;
 		} break;
 
 
-		case NOTIFICATION_WM_ABOUT: {
-
-#ifdef TOOLS_ENABLED
-			if (EditorNode::get_singleton()) {
-				EditorNode::get_singleton()->show_about();
-			} else {
-#endif
-				get_root()->propagate_notification(p_notification);
-#ifdef TOOLS_ENABLED
-			}
-#endif
-		} break;
-
 		case NOTIFICATION_CRASH: {
 		case NOTIFICATION_CRASH: {
 
 
 			get_root()->propagate_notification(p_notification);
 			get_root()->propagate_notification(p_notification);