1 files changed, 52 insertions, 70 deletions

diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 4bcf5a49e6..54c6ff79ea 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -254,7 +254,7 @@ void EditorNode::_notification(int p_what) {
 		get_tree()->get_root()->set_as_audio_listener_2d(false);
 		get_tree()->set_auto_accept_quit(false);
 		get_tree()->connect("files_dropped", this, "_dropped_files");
-		property_editable_warning->set_icon(gui_base->get_icon("NodeWarning","EditorIcons"));
+		property_editable_warning->set_icon(gui_base->get_icon("NodeWarning", "EditorIcons"));
 	}
 
 	if (p_what == NOTIFICATION_EXIT_TREE) {
@@ -1436,18 +1436,18 @@ void EditorNode::_edit_current() {
 		EditorNode::get_singleton()->get_import_dock()->set_edit_path(current_res->get_path());
 
 		int subr_idx = current_res->get_path().find("::");
-		if (subr_idx!=-1) {
-			String base_path=current_res->get_path().substr(0,subr_idx);
-			if (FileAccess::exists(base_path+".import")) {
-				editable_warning=TTR("This resource belongs to a scene that was imported, so it's not editable.\nPlease read the documentation relevant to importing scenes to better understand this workflow.");
+		if (subr_idx != -1) {
+			String base_path = current_res->get_path().substr(0, subr_idx);
+			if (FileAccess::exists(base_path + ".import")) {
+				editable_warning = TTR("This resource belongs to a scene that was imported, so it's not editable.\nPlease read the documentation relevant to importing scenes to better understand this workflow.");
 			} else {
-				if (!get_edited_scene() || get_edited_scene()->get_filename()!=base_path) {
-					editable_warning=TTR("This resource belongs to a scene that was instanced or inherited.\nChanges to it will not be kept when saving the current scene.");
+				if (!get_edited_scene() || get_edited_scene()->get_filename() != base_path) {
+					editable_warning = TTR("This resource belongs to a scene that was instanced or inherited.\nChanges to it will not be kept when saving the current scene.");
 				}
 			}
-		} else if (current_res->get_path().is_resource_file()){
-			if (FileAccess::exists(current_res->get_path()+".import")) {
-				editable_warning=TTR("This resource was imported, so it's not editable. Change it's settings in the import panel and re-import.");
+		} else if (current_res->get_path().is_resource_file()) {
+			if (FileAccess::exists(current_res->get_path() + ".import")) {
+				editable_warning = TTR("This resource was imported, so it's not editable. Change it's settings in the import panel and re-import.");
 			}
 		}
 	} else if (is_node) {
@@ -1465,10 +1465,10 @@ void EditorNode::_edit_current() {
 		}
 		object_menu->get_popup()->clear();
 
-		if (get_edited_scene() && get_edited_scene()->get_filename()!=String()) {
+		if (get_edited_scene() && get_edited_scene()->get_filename() != String()) {
 			String source_scene = get_edited_scene()->get_filename();
-			if (FileAccess::exists(source_scene+".import")) {
-				editable_warning=TTR("This scene was imported, so changes to it will not be kept.\nInstancing it or inheriting will allow making changes to it.\nPlease read the documentation relevant to importing scenes to better understand this workflow.");
+			if (FileAccess::exists(source_scene + ".import")) {
+				editable_warning = TTR("This scene was imported, so changes to it will not be kept.\nInstancing it or inheriting will allow making changes to it.\nPlease read the documentation relevant to importing scenes to better understand this workflow.");
 			}
 		}
 
@@ -1478,10 +1478,9 @@ void EditorNode::_edit_current() {
 		node_dock->set_node(NULL);
 	}
 
-	if (editable_warning!=String()) {
+	if (editable_warning != String()) {
 		property_editable_warning->show(); //hide by default
 		property_editable_warning_dialog->set_text(editable_warning);
-
 	}
 
 	/* Take care of PLUGIN EDITOR */
@@ -2781,14 +2780,6 @@ Dictionary EditorNode::_get_main_scene_state() {
 	state["property_edit_offset"] = get_property_editor()->get_scene_tree()->get_vscroll_bar()->get_value();
 	state["saved_version"] = saved_version;
 	state["node_filter"] = scene_tree_dock->get_filter();
-	int current = -1;
-	for (int i = 0; i < editor_table.size(); i++) {
-		if (editor_plugin_screen == editor_table[i]) {
-			current = i;
-			break;
-		}
-	}
-	state["editor_index"] = current;
 	return state;
 }
 
@@ -2799,29 +2790,32 @@ void EditorNode::_set_main_scene_state(Dictionary p_state, Node *p_for_scene) {
 
 	changing_scene = false;
 
-	if (p_state.has("editor_index")) {
-
-		int index = p_state["editor_index"];
-		int current = -1;
-		for (int i = 0; i < editor_table.size(); i++) {
-			if (editor_plugin_screen == editor_table[i]) {
-				current = i;
-				break;
-			}
+	int current = -1;
+	for (int i = 0; i < editor_table.size(); i++) {
+		if (editor_plugin_screen == editor_table[i]) {
+			current = i;
+			break;
 		}
+	}
 
+	if (p_state.has("editor_index")) {
+		int index = p_state["editor_index"];
 		if (current < 2) { //if currently in spatial/2d, only switch to spatial/2d. if curently in script, stay there
 			if (index < 2 || !get_edited_scene()) {
 				_editor_select(index);
-			} else {
-				//use heuristic instead
-				int n2d = 0, n3d = 0;
-				_find_node_types(get_edited_scene(), n2d, n3d);
-				if (n2d > n3d) {
-					_editor_select(EDITOR_2D);
-				} else if (n3d > n2d) {
-					_editor_select(EDITOR_3D);
-				}
+			}
+		}
+	}
+
+	if (get_edited_scene()) {
+		if (current < 2) {
+			//use heuristic instead
+			int n2d = 0, n3d = 0;
+			_find_node_types(get_edited_scene(), n2d, n3d);
+			if (n2d > n3d) {
+				_editor_select(EDITOR_2D);
+			} else if (n3d > n2d) {
+				_editor_select(EDITOR_3D);
 			}
 		}
 	}
@@ -3252,9 +3246,9 @@ void EditorNode::register_editor_types() {
 	ClassDB::register_class<EditorFileSystemDirectory>();
 	ClassDB::register_virtual_class<ScriptEditor>();
 	ClassDB::register_virtual_class<EditorInterface>();
+	ClassDB::register_class<EditorExportPlugin>();
 
 	// FIXME: Is this stuff obsolete, or should it be ported to new APIs?
-	//ClassDB::register_class<EditorExportPlugin>();
 	//ClassDB::register_class<EditorScenePostImport>();
 	//ClassDB::register_type<EditorImportExport>();
 }
@@ -3344,9 +3338,9 @@ void EditorNode::_editor_file_dialog_unregister(EditorFileDialog *p_dialog) {
 
 Vector<EditorNodeInitCallback> EditorNode::_init_callbacks;
 
-Error EditorNode::export_preset(const String &preset, const String &p_path, bool p_debug, const String &p_password, bool p_quit_after) {
+Error EditorNode::export_preset(const String &p_preset, const String &p_path, bool p_debug, const String &p_password, bool p_quit_after) {
 
-	export_defer.preset = preset;
+	export_defer.preset = p_preset;
 	export_defer.path = p_path;
 	export_defer.debug = p_debug;
 	export_defer.password = p_password;
@@ -4067,6 +4061,13 @@ void EditorNode::_bottom_panel_switch(bool p_enable, int p_idx) {
 	ERR_FAIL_INDEX(p_idx, bottom_panel_items.size());
 
 	if (p_enable) {
+		// this is the debug panel wich uses tabs, so the top section should be smaller
+		if (ScriptEditor::get_singleton()->get_debugger() == bottom_panel_items[p_idx].control) {
+			Ref<StyleBoxFlat> style_panel_invisible_top = gui_base->get_stylebox("debugger_panel", "EditorStyles");
+			bottom_panel->add_style_override("panel", style_panel_invisible_top);
+		} else {
+			bottom_panel->add_style_override("panel", gui_base->get_stylebox("panel", "TabContainer"));
+		}
 		for (int i = 0; i < bottom_panel_items.size(); i++) {
 
 			bottom_panel_items[i].button->set_pressed(i == p_idx);
@@ -4075,11 +4076,14 @@ void EditorNode::_bottom_panel_switch(bool p_enable, int p_idx) {
 		center_split->set_dragger_visibility(SplitContainer::DRAGGER_VISIBLE);
 		center_split->set_collapsed(false);
 	} else {
+		bottom_panel->add_style_override("panel", gui_base->get_stylebox("panel", "TabContainer"));
+
 		for (int i = 0; i < bottom_panel_items.size(); i++) {
 
 			bottom_panel_items[i].button->set_pressed(false);
 			bottom_panel_items[i].control->set_visible(false);
 		}
+
 		center_split->set_dragger_visibility(SplitContainer::DRAGGER_HIDDEN);
 		center_split->set_collapsed(true);
 	}
@@ -4422,22 +4426,6 @@ void EditorNode::_dim_timeout() {
 	}
 }
 
-void EditorNode::_check_gui_base_size() {
-	if (gui_base->get_size().width > 1200 * EDSCALE) {
-		for (int i = 0; i < singleton->main_editor_button_vb->get_child_count(); i++) {
-			ToolButton *btn = Object::cast_to<ToolButton>(singleton->main_editor_button_vb->get_child(i));
-			if (btn == singleton->distraction_free) continue;
-			btn->set_text(btn->get_name());
-		}
-	} else {
-		for (int i = 0; i < singleton->main_editor_button_vb->get_child_count(); i++) {
-			ToolButton *btn = Object::cast_to<ToolButton>(singleton->main_editor_button_vb->get_child(i));
-			if (btn == singleton->distraction_free) continue;
-			btn->set_text("");
-		}
-	}
-}
-
 void EditorNode::open_export_template_manager() {
 
 	export_template_manager->popup_manager();
@@ -4511,15 +4499,12 @@ void EditorNode::_bind_methods() {
 	ClassDB::bind_method("_toggle_distraction_free_mode", &EditorNode::_toggle_distraction_free_mode);
 	ClassDB::bind_method("_property_editable_warning_pressed", &EditorNode::_property_editable_warning_pressed);
 
-
-
 	ClassDB::bind_method(D_METHOD("get_gui_base"), &EditorNode::get_gui_base);
 	ClassDB::bind_method(D_METHOD("_bottom_panel_switch"), &EditorNode::_bottom_panel_switch);
 
 	ClassDB::bind_method(D_METHOD("_open_imported"), &EditorNode::_open_imported);
 	ClassDB::bind_method(D_METHOD("_inherit_imported"), &EditorNode::_inherit_imported);
 	ClassDB::bind_method(D_METHOD("_dim_timeout"), &EditorNode::_dim_timeout);
-	ClassDB::bind_method(D_METHOD("_check_gui_base_size"), &EditorNode::_check_gui_base_size);
 
 	ClassDB::bind_method(D_METHOD("_resources_reimported"), &EditorNode::_resources_reimported);
 
@@ -4669,7 +4654,6 @@ EditorNode::EditorNode() {
 	gui_base = memnew(Panel);
 	theme_base->add_child(gui_base);
 	gui_base->set_area_as_parent_rect();
-	gui_base->connect("item_rect_changed", this, "_check_gui_base_size");
 
 	Ref<Theme> theme = create_editor_theme();
 	theme_base->set_theme(theme);
@@ -4857,7 +4841,7 @@ EditorNode::EditorNode() {
 	scene_root_parent = memnew(PanelContainer);
 	scene_root_parent->set_custom_minimum_size(Size2(0, 80) * EDSCALE);
 	scene_root_parent->add_style_override("panel", gui_base->get_stylebox("Content", "EditorStyles"));
-
+	scene_root_parent->set_draw_behind_parent(true);
 	srt->add_child(scene_root_parent);
 	scene_root_parent->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 
@@ -5273,14 +5257,13 @@ EditorNode::EditorNode() {
 	search_bar->add_child(clear_button);
 	clear_button->connect("pressed", this, "_clear_search_box");
 
-	property_editable_warning = memnew (Button);
+	property_editable_warning = memnew(Button);
 	property_editable_warning->set_text(TTR("Changes may be lost!"));
 	prop_editor_base->add_child(property_editable_warning);
-	property_editable_warning_dialog = memnew( AcceptDialog );
+	property_editable_warning_dialog = memnew(AcceptDialog);
 	gui_base->add_child(property_editable_warning_dialog);
 	property_editable_warning->hide();
-	property_editable_warning->connect("pressed",this,"_property_editable_warning_pressed");
-
+	property_editable_warning->connect("pressed", this, "_property_editable_warning_pressed");
 
 	property_editor = memnew(PropertyEditor);
 	property_editor->set_autoclear(true);
@@ -5302,7 +5285,6 @@ EditorNode::EditorNode() {
 	dock_slot[DOCK_SLOT_RIGHT_UL]->add_child(import_dock);
 	import_dock->set_name(TTR("Import"));
 
-
 	bool use_single_dock_column = (OS::get_singleton()->get_screen_size(OS::get_singleton()->get_current_screen()).x < 1200);
 
 	node_dock = memnew(NodeDock);