godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

-Massive editor dialog cleanup

Browse Source 
-Added a bottom menu list
This commit is contained in:
Juan Linietsky
2016-01-17 20:03:57 -03:00
parent 72fcb8a35b
commit 74a48a0140
32 changed files with 597 additions and 519 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
tools/editor/animation_editor.cpp
View File

@@ -1085,6 +1085,7 @@ void AnimationKeyEditor::_track_editor_draw() {
move_up_button->set_disabled(true);
move_down_button->set_disabled(true);
remove_button->set_disabled(true);
return;
}
@@ -3023,7 +3024,7 @@ void AnimationKeyEditor::set_keying(bool p_enabled) {
bool AnimationKeyEditor::has_keying() const {
return keying;
return is_visible();
}
void AnimationKeyEditor::_query_insert(const InsertData& p_id) {
@@ -3352,6 +3353,7 @@ Ref<Animation> AnimationKeyEditor::get_current_animation() const {
void AnimationKeyEditor::_animation_len_changed(float p_len) {
if (updating)
return;
@@ -3479,8 +3481,10 @@ void AnimationKeyEditor::_insert_delay() {
void AnimationKeyEditor::_step_changed(float p_len) {
updating=true;
if (!animation.is_null())
if (!animation.is_null()) {
animation->set_step(p_len);
emit_signal("animation_step_changed",animation->get_length());
}
updating=false;
}
@@ -3691,21 +3695,33 @@ void AnimationKeyEditor::_bind_methods() {
ADD_SIGNAL( MethodInfo("keying_changed" ) );
ADD_SIGNAL( MethodInfo("timeline_changed", PropertyInfo(Variant::REAL,"pos") ) );
ADD_SIGNAL( MethodInfo("animation_len_changed", PropertyInfo(Variant::REAL,"len") ) );
ADD_SIGNAL( MethodInfo("animation_step_changed", PropertyInfo(Variant::REAL,"step") ) );
ADD_SIGNAL( MethodInfo("key_edited", PropertyInfo(Variant::INT,"track"), PropertyInfo(Variant::INT,"key") ) );
}
AnimationKeyEditor::AnimationKeyEditor(UndoRedo *p_undo_redo, EditorHistory *p_history,EditorSelection *p_selection) {
AnimationKeyEditor::AnimationKeyEditor() {
alc="animation_len_changed";
editor_selection=p_selection;
editor_selection=EditorNode::get_singleton()->get_editor_selection();
selected_track=-1;
updating=false;
te_drawing=false;
undo_redo=p_undo_redo;
history=p_history;
undo_redo=EditorNode::get_singleton()->get_undo_redo();
history=EditorNode::get_singleton()->get_editor_history();
ec = memnew (Control);
ec->set_custom_minimum_size(Size2(0,150));
add_child(ec);
ec->set_v_size_flags(SIZE_EXPAND_FILL);
h_scroll = memnew( HScrollBar );
h_scroll->connect("value_changed",this,"_scroll_changed");
add_child(h_scroll);
h_scroll->set_val(0);
HBoxContainer *hb = memnew( HBoxContainer );
add_child(hb);
@@ -3863,10 +3879,6 @@ AnimationKeyEditor::AnimationKeyEditor(UndoRedo *p_undo_redo, EditorHistory *p_h
// menu->get_popup()->connect("item_pressed",this,"_menu_callback");
ec = memnew (Control);
ec->set_custom_minimum_size(Size2(0,150));
add_child(ec);
ec->set_v_size_flags(SIZE_EXPAND_FILL);
hb = memnew( HBoxContainer);
hb->set_area_as_parent_rect();
@@ -3943,12 +3955,6 @@ AnimationKeyEditor::AnimationKeyEditor(UndoRedo *p_undo_redo, EditorHistory *p_h
curve_edit->set_v_size_flags(SIZE_EXPAND_FILL);
key_editor_tab->add_child(curve_vb);
h_scroll = memnew( HScrollBar );
h_scroll->connect("value_changed",this,"_scroll_changed");
add_child(h_scroll);
h_scroll->set_val(0);
track_name = memnew( LineEdit );
track_name->set_as_toplevel(true);
track_name->hide();
@@ -4025,6 +4031,7 @@ AnimationKeyEditor::AnimationKeyEditor(UndoRedo *p_undo_redo, EditorHistory *p_h
cleanup_dialog->connect("confirmed",this,"_menu_track",varray(TRACK_MENU_CLEAN_UP_CONFIRM));
add_constant_override("separation",get_constant("separation","VBoxContainer"));
}