aboutsummaryrefslogtreecommitdiff
path: root/tools/editor/animation_editor.cpp
diff options
context:
space:
mode:
authorJuan Linietsky2015-01-03 17:24:16 -0300
committerJuan Linietsky2015-01-03 17:24:16 -0300
commitdc7ac86b798f40e1472871391af49a562879eadc (patch)
tree0cae39a004458c5a62cc14888a35f53e88aa42a1 /tools/editor/animation_editor.cpp
parent0e1d70f637c31aa107f109a2e21ec9cd5e82d047 (diff)
downloadgodot-dc7ac86b798f40e1472871391af49a562879eadc.tar.gz
godot-dc7ac86b798f40e1472871391af49a562879eadc.tar.zst
godot-dc7ac86b798f40e1472871391af49a562879eadc.zip
-Completely removed EmptyControl (but added fallback), closes #1017
Diffstat (limited to 'tools/editor/animation_editor.cpp')
-rw-r--r--tools/editor/animation_editor.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/editor/animation_editor.cpp b/tools/editor/animation_editor.cpp
index 2eef82143..db70a2675 100644
--- a/tools/editor/animation_editor.cpp
+++ b/tools/editor/animation_editor.cpp
@@ -2909,11 +2909,11 @@ void AnimationKeyEditor::set_anim_pos(float p_pos) {
void AnimationKeyEditor::_pane_drag(const Point2& p_delta) {
- Size2 ecs = ec->get_minsize();
+ Size2 ecs = ec->get_custom_minimum_size();
ecs.y-=p_delta.y;
if (ecs.y<100)
ecs.y=100;
- ec->set_minsize(ecs);;
+ ec->set_custom_minimum_size(ecs);;
}
@@ -3296,8 +3296,8 @@ AnimationKeyEditor::AnimationKeyEditor(UndoRedo *p_undo_redo, EditorHistory *p_h
// menu->get_popup()->connect("item_pressed",this,"_menu_callback");
- ec = memnew (EmptyControl);
- ec->set_minsize(Size2(0,50));
+ ec = memnew (Control);
+ ec->set_custom_minimum_size(Size2(0,50));
add_child(ec);
ec->set_v_size_flags(SIZE_EXPAND_FILL);