diff options
| author | Juan Linietsky | 2016-02-08 13:01:54 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2016-02-08 13:01:54 -0300 |
| commit | 92a3b9fb9fe26db7c2ce6f2c82e9b15d36df93bf (patch) | |
| tree | 224ae31f3ff19e532054ea7c9d994513d02bc21a /tools/editor/editor_node.cpp | |
| parent | 3cce2d688196e13f9d16b7e480db1d1b62aa8f84 (diff) | |
| download | godot-92a3b9fb9fe26db7c2ce6f2c82e9b15d36df93bf.tar.gz godot-92a3b9fb9fe26db7c2ce6f2c82e9b15d36df93bf.tar.zst godot-92a3b9fb9fe26db7c2ce6f2c82e9b15d36df93bf.zip | |
-Property apply limits to V/H Splits in main editor window. Fixes #3567
Diffstat (limited to 'tools/editor/editor_node.cpp')
| -rw-r--r-- | tools/editor/editor_node.cpp | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 1abcb8f60..b270d8b8c 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -5041,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) ); @@ -5052,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 ); @@ -5073,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); |
