1 files changed, 23 insertions, 15 deletions

diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index 9fe76a738a..b270d8b8cc 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -2214,7 +2214,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
 
 		case FILE_EXPORT_PROJECT: {
 
-			project_export_settings->popup_centered_ratio();
+			project_export_settings->popup_export();
 			/*
 			String target = export_db->get_current_platform();
 			Ref<EditorExporter> exporter = export_db->get_exporter(target);
@@ -3661,6 +3661,7 @@ void EditorNode::update_keying() {
 
 	property_editor->set_keying(valid);
 
+	AnimationPlayerEditor::singleton->get_key_editor()->update_keying();
 }
 
 
@@ -4592,6 +4593,16 @@ ToolButton *EditorNode::add_bottom_panel_item(String p_text,Control *p_item) {
 
 }
 
+bool EditorNode::are_bottom_panels_hidden() const {
+
+	for(int i=0;i<bottom_panel_items.size();i++) {
+		if (bottom_panel_items[i].button->is_pressed())
+			return false;
+	}
+
+	return true;
+}
+
 void EditorNode::hide_bottom_panel() {
 
 	_bottom_panel_switch(false,0);
@@ -5030,10 +5041,14 @@ EditorNode::EditorNode() {
 
 	srt->add_child(scene_tabs);
 
-	scene_root_parent = memnew( Panel );
+	scene_root_parent = memnew( PanelContainer );
+	scene_root_parent->set_custom_minimum_size(Size2(0,80));
+
+
+	//Ref<StyleBox> sp = scene_root_parent->get_stylebox("panel","TabContainer");
+	//scene_root_parent->add_style_override("panel",sp);
+
 
-	Ref<StyleBox> sp = scene_root_parent->get_stylebox("panel","TabContainer");
-	scene_root_parent->add_style_override("panel",sp);
 	/*scene_root_parent->set_anchor( MARGIN_RIGHT, Control::ANCHOR_END );
 	scene_root_parent->set_anchor( MARGIN_BOTTOM, Control::ANCHOR_END );
 	scene_root_parent->set_begin( Point2( 0, 0) );
@@ -5041,13 +5056,6 @@ EditorNode::EditorNode() {
 	srt->add_child(scene_root_parent);
 	scene_root_parent->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 
-	scene_root_base = memnew( Control );
-	scene_root_base->set_area_as_parent_rect();
-	for(int i=0;i<4;i++) {
-		scene_root_base->set_margin(Margin(i),sp->get_margin(Margin(i)));
-	}
-	scene_root_parent->add_child(scene_root_base);
-
 
 	scene_root = memnew( Viewport );
 
@@ -5062,11 +5070,11 @@ EditorNode::EditorNode() {
 //	scene_root->set_world_2d( Ref<World2D>( memnew( World2D )) );
 
 
-	viewport = memnew( Control );
-	viewport->set_area_as_parent_rect(4);
-	for(int i=0;i<4;i++) {
+	viewport = memnew( VBoxContainer );
+	viewport->set_v_size_flags(Control::SIZE_EXPAND_FILL);
+	/*for(int i=0;i<4;i++) {
 		viewport->set_margin(Margin(i),sp->get_margin(Margin(i)));
-	}
+	}*/
 	scene_root_parent->add_child(viewport);