godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-Property apply limits to V/H Splits in main editor window. Fixes #3567

This commit is contained in:
Juan Linietsky 2016-02-08 13:01:54 -03:00
parent 3cce2d6881
commit 92a3b9fb9f
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tools/editor/editor_node.cpp
View File

@ -5041,10 +5041,14 @@ EditorNode::EditorNode() {
srt->add_child(scene_tabs); 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_RIGHT, Control::ANCHOR_END );
scene_root_parent->set_anchor( MARGIN_BOTTOM, Control::ANCHOR_END ); scene_root_parent->set_anchor( MARGIN_BOTTOM, Control::ANCHOR_END );
scene_root_parent->set_begin( Point2( 0, 0) ); scene_root_parent->set_begin( Point2( 0, 0) );
@ -5052,13 +5056,6 @@ EditorNode::EditorNode() {
srt->add_child(scene_root_parent); srt->add_child(scene_root_parent);
scene_root_parent->set_v_size_flags(Control::SIZE_EXPAND_FILL); 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 ); scene_root = memnew( Viewport );
@ -5073,11 +5070,11 @@ EditorNode::EditorNode() {
// scene_root->set_world_2d( Ref<World2D>( memnew( World2D )) ); // scene_root->set_world_2d( Ref<World2D>( memnew( World2D )) );
viewport = memnew( Control ); viewport = memnew( VBoxContainer );
viewport->set_area_as_parent_rect(4); viewport->set_v_size_flags(Control::SIZE_EXPAND_FILL);
for(int i=0;i<4;i++) { /*for(int i=0;i<4;i++) {
viewport->set_margin(Margin(i),sp->get_margin(Margin(i))); viewport->set_margin(Margin(i),sp->get_margin(Margin(i)));
} }*/
scene_root_parent->add_child(viewport); scene_root_parent->add_child(viewport);

2
tools/editor/editor_node.h
View File

@ -258,7 +258,7 @@ class EditorNode : public Node {
TextEdit *load_errors; TextEdit *load_errors;
AcceptDialog *load_error_dialog; AcceptDialog *load_error_dialog;
Control *scene_root_base; //Control *scene_root_base;
Ref<Theme> theme; Ref<Theme> theme;
PopupMenu *recent_scenes; PopupMenu *recent_scenes;

1
tools/editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -3528,6 +3528,7 @@ CanvasItemEditorPlugin::CanvasItemEditorPlugin(EditorNode *p_node) {
editor=p_node; editor=p_node;
canvas_item_editor = memnew( CanvasItemEditor(editor) ); canvas_item_editor = memnew( CanvasItemEditor(editor) );
canvas_item_editor->set_v_size_flags(Control::SIZE_EXPAND_FILL);
editor->get_viewport()->add_child(canvas_item_editor); editor->get_viewport()->add_child(canvas_item_editor);
canvas_item_editor->set_area_as_parent_rect(); canvas_item_editor->set_area_as_parent_rect();
canvas_item_editor->hide(); canvas_item_editor->hide();

2
tools/editor/plugins/script_editor_plugin.cpp
View File

@ -2677,7 +2677,7 @@ ScriptEditorPlugin::ScriptEditorPlugin(EditorNode *p_node) {
editor=p_node; editor=p_node;
script_editor = memnew( ScriptEditor(p_node) ); script_editor = memnew( ScriptEditor(p_node) );
editor->get_viewport()->add_child(script_editor); editor->get_viewport()->add_child(script_editor);
script_editor->set_area_as_parent_rect(); script_editor->set_v_size_flags(Control::SIZE_EXPAND_FILL);
script_editor->hide(); script_editor->hide();

4
tools/editor/plugins/spatial_editor_plugin.cpp
View File

@ -4217,8 +4217,10 @@ SpatialEditorPlugin::SpatialEditorPlugin(EditorNode *p_node) {
editor=p_node; editor=p_node;
spatial_editor = memnew( SpatialEditor(p_node) ); spatial_editor = memnew( SpatialEditor(p_node) );
spatial_editor->set_v_size_flags(Control::SIZE_EXPAND_FILL);
editor->get_viewport()->add_child(spatial_editor); editor->get_viewport()->add_child(spatial_editor);
spatial_editor->set_area_as_parent_rect();
//spatial_editor->set_area_as_parent_rect();
spatial_editor->hide(); spatial_editor->hide();
spatial_editor->connect("transform_key_request",editor,"_transform_keyed"); spatial_editor->connect("transform_key_request",editor,"_transform_keyed");