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

Merge pull request #5937 from neikeq/pr-issue-5932 

Project Settings: Use containers for the Input Map tab content
This commit is contained in:
Rémi Verschelde 2016-07-27 18:44:03 +02:00 committed by GitHub
parent 3d71f5e5ad 9df192d8ec
commit 1d87108b5b
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
tools/editor/project_settings.cpp
View File

@ -1375,34 +1375,35 @@ ProjectSettings::ProjectSettings(EditorData *p_data) {
input_base->set_area_as_parent_rect();; input_base->set_area_as_parent_rect();;
tab_container->add_child(input_base); tab_container->add_child(input_base);
VBoxContainer *vbc = memnew( VBoxContainer );
input_base->add_child(vbc);
vbc->set_anchor_and_margin(MARGIN_TOP,ANCHOR_BEGIN, 5 );
vbc->set_anchor_and_margin(MARGIN_BOTTOM,ANCHOR_END, 5 );
vbc->set_anchor_and_margin(MARGIN_LEFT,ANCHOR_BEGIN, 5 );
vbc->set_anchor_and_margin(MARGIN_RIGHT,ANCHOR_END, 5 );
l = memnew( Label ); l = memnew( Label );
input_base->add_child(l); vbc->add_child(l);
l->set_pos(Point2(6,5)); l->set_pos(Point2(6,5));
l->set_text(TTR("Action:")); l->set_text(TTR("Action:"));
hbc = memnew( HBoxContainer );
vbc->add_child(hbc);
action_name = memnew( LineEdit ); action_name = memnew( LineEdit );
action_name->set_anchor(MARGIN_RIGHT,ANCHOR_RATIO); action_name->set_h_size_flags(SIZE_EXPAND_FILL);
action_name->set_begin( Point2(5,25) ); hbc->add_child(action_name);
action_name->set_end( Point2(0.85,26) );
input_base->add_child(action_name);
action_name->connect("text_entered",this,"_action_adds"); action_name->connect("text_entered",this,"_action_adds");
add = memnew( Button ); add = memnew( Button );
input_base->add_child(add); hbc->add_child(add);
add->set_anchor(MARGIN_LEFT,ANCHOR_RATIO); add->set_custom_minimum_size(Size2(150, 0));
add->set_begin( Point2(0.86,25) );
add->set_anchor(MARGIN_RIGHT,ANCHOR_END);
add->set_end( Point2(5,26) );
add->set_text(TTR("Add")); add->set_text(TTR("Add"));
add->connect("pressed",this,"_action_add"); add->connect("pressed",this,"_action_add");
input_editor = memnew( Tree ); input_editor = memnew( Tree );
input_base->add_child(input_editor); vbc->add_child(input_editor);
input_editor->set_area_as_parent_rect(); input_editor->set_v_size_flags(SIZE_EXPAND_FILL);
input_editor->set_anchor_and_margin(MARGIN_TOP,ANCHOR_BEGIN, 55 );
input_editor->set_anchor_and_margin(MARGIN_BOTTOM,ANCHOR_END, 35 );
input_editor->set_anchor_and_margin(MARGIN_LEFT,ANCHOR_BEGIN, 5 );
input_editor->set_anchor_and_margin(MARGIN_RIGHT,ANCHOR_END, 5 );
input_editor->connect("item_edited",this,"_action_edited"); input_editor->connect("item_edited",this,"_action_edited");
input_editor->connect("cell_selected",this,"_action_selected"); input_editor->connect("cell_selected",this,"_action_selected");
input_editor->connect("button_pressed",this,"_action_button_pressed"); input_editor->connect("button_pressed",this,"_action_button_pressed");