Merge pull request #69797 from TokageItLab/time-edit-inspector-plugin

Animation: Add inspector plugin for key time edit & Change `track_find_key()` argument to find key with approximate

13 files changed, 1315 insertions, 1231 deletions

diff --git a/editor/animation_bezier_editor.cpp b/editor/animation_bezier_editor.cpp
index 530708f3e5..7b5a7b7046 100644
--- a/editor/animation_bezier_editor.cpp
+++ b/editor/animation_bezier_editor.cpp
@@ -575,7 +575,7 @@ void AnimationBezierTrackEdit::_notification(int p_what) {
 							ep.point_rect.size = bezier_icon->get_size();
 							if (selection.has(IntPair(i, j))) {
 								draw_texture(selected_icon, ep.point_rect.position);
-								draw_string(font, ep.point_rect.position + Vector2(8, -font->get_height(font_size) - 8), TTR("Time:") + " " + TS->format_number(rtos(Math::snapped(offset, 0.001))), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, accent);
+								draw_string(font, ep.point_rect.position + Vector2(8, -font->get_height(font_size) - 8), TTR("Time:") + " " + TS->format_number(rtos(Math::snapped(offset, 0.0001))), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, accent);
 								draw_string(font, ep.point_rect.position + Vector2(8, -8), TTR("Value:") + " " + TS->format_number(rtos(Math::snapped(value, 0.001))), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, accent);
 							} else {
 								Color track_color = Color(1, 1, 1, 1);
@@ -812,7 +812,7 @@ void AnimationBezierTrackEdit::_select_at_anim(const Ref<Animation> &p_anim, int
 		return;
 	}
 
-	int idx = animation->track_find_key(p_track, p_pos, true);
+	int idx = animation->track_find_key(p_track, p_pos, Animation::FIND_MODE_APPROX);
 	ERR_FAIL_COND(idx < 0);
 
 	selection.insert(IntPair(p_track, idx));
@@ -1168,8 +1168,8 @@ void AnimationBezierTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 			new_point[4] = 0;
 
 			real_t time = ((mb->get_position().x - limit) / timeline->get_zoom_scale()) + timeline->get_value();
-			while (animation->track_find_key(selected_track, time, true) != -1) {
-				time += 0.001;
+			while (animation->track_find_key(selected_track, time, Animation::FIND_MODE_APPROX) != -1) {
+				time += 0.0001;
 			}
 
 			Ref<EditorUndoRedoManager> &undo_redo = EditorNode::get_undo_redo();
@@ -1179,7 +1179,7 @@ void AnimationBezierTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 			undo_redo->commit_action();
 
 			//then attempt to move
-			int index = animation->track_find_key(selected_track, time, true);
+			int index = animation->track_find_key(selected_track, time, Animation::FIND_MODE_APPROX);
 			ERR_FAIL_COND(index == -1);
 			_clear_selection();
 			selection.insert(IntPair(selected_track, index));
@@ -1283,7 +1283,7 @@ void AnimationBezierTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 				for (SelectionSet::Element *E = selection.back(); E; E = E->prev()) {
 					real_t newtime = editor->snap_time(animation->track_get_key_time(E->get().first, E->get().second) + moving_selection_offset.x);
 
-					int idx = animation->track_find_key(E->get().first, newtime, true);
+					int idx = animation->track_find_key(E->get().first, newtime, Animation::FIND_MODE_APPROX);
 					if (idx == -1) {
 						continue;
 					}
@@ -1539,7 +1539,7 @@ void AnimationBezierTrackEdit::_menu_selected(int p_index) {
 
 				real_t time = ((menu_insert_key.x - limit) / timeline->get_zoom_scale()) + timeline->get_value();
 
-				while (animation->track_find_key(selected_track, time, true) != -1) {
+				while (animation->track_find_key(selected_track, time, Animation::FIND_MODE_APPROX) != -1) {
 					time += 0.001;
 				}
 
@@ -1599,7 +1599,7 @@ void AnimationBezierTrackEdit::duplicate_selection() {
 	for (SelectionSet::Element *E = selection.back(); E; E = E->prev()) {
 		real_t t = animation->track_get_key_time(E->get().first, E->get().second);
 		real_t dst_time = t + (timeline->get_play_position() - top_time);
-		int existing_idx = animation->track_find_key(E->get().first, dst_time, true);
+		int existing_idx = animation->track_find_key(E->get().first, dst_time, Animation::FIND_MODE_APPROX);
 
 		undo_redo->add_do_method(animation.ptr(), "track_insert_key", E->get().first, dst_time, animation->track_get_key_value(E->get().first, E->get().second), animation->track_get_key_transition(E->get().first, E->get().second));
 		undo_redo->add_undo_method(animation.ptr(), "track_remove_key_at_time", E->get().first, dst_time);
@@ -1623,7 +1623,7 @@ void AnimationBezierTrackEdit::duplicate_selection() {
 		int track = E.first;
 		real_t time = E.second;
 
-		int existing_idx = animation->track_find_key(track, time, true);
+		int existing_idx = animation->track_find_key(track, time, Animation::FIND_MODE_APPROX);
 
 		if (existing_idx == -1) {
 			continue;
diff --git a/editor/animation_track_editor.cpp b/editor/animation_track_editor.cpp
index 2ee06a0dbd..74e0db967d 100644
--- a/editor/animation_track_editor.cpp
+++ b/editor/animation_track_editor.cpp
@@ -48,1356 +48,1182 @@
 #include "scene/scene_string_names.h"
 #include "servers/audio/audio_stream.h"
 
-class AnimationTrackKeyEdit : public Object {
-	GDCLASS(AnimationTrackKeyEdit, Object);
-
-public:
-	bool setting = false;
-	bool animation_read_only = false;
+void AnimationTrackKeyEdit::_bind_methods() {
+	ClassDB::bind_method(D_METHOD("_update_obj"), &AnimationTrackKeyEdit::_update_obj);
+	ClassDB::bind_method(D_METHOD("_key_ofs_changed"), &AnimationTrackKeyEdit::_key_ofs_changed);
+	ClassDB::bind_method(D_METHOD("_hide_script_from_inspector"), &AnimationTrackKeyEdit::_hide_script_from_inspector);
+	ClassDB::bind_method(D_METHOD("_hide_metadata_from_inspector"), &AnimationTrackKeyEdit::_hide_metadata_from_inspector);
+	ClassDB::bind_method(D_METHOD("get_root_path"), &AnimationTrackKeyEdit::get_root_path);
+	ClassDB::bind_method(D_METHOD("_dont_undo_redo"), &AnimationTrackKeyEdit::_dont_undo_redo);
+	ClassDB::bind_method(D_METHOD("_is_read_only"), &AnimationTrackKeyEdit::_is_read_only);
+}
 
-	bool _hide_script_from_inspector() { return true; }
-	bool _hide_metadata_from_inspector() { return true; }
-	bool _dont_undo_redo() { return true; }
+void AnimationTrackKeyEdit::_fix_node_path(Variant &value) {
+	NodePath np = value;
 
-	bool _is_read_only() {
-		return animation_read_only;
+	if (np == NodePath()) {
+		return;
 	}
 
-	static void _bind_methods() {
-		ClassDB::bind_method(D_METHOD("_update_obj"), &AnimationTrackKeyEdit::_update_obj);
-		ClassDB::bind_method(D_METHOD("_key_ofs_changed"), &AnimationTrackKeyEdit::_key_ofs_changed);
-		ClassDB::bind_method(D_METHOD("_hide_script_from_inspector"), &AnimationTrackKeyEdit::_hide_script_from_inspector);
-		ClassDB::bind_method(D_METHOD("_hide_metadata_from_inspector"), &AnimationTrackKeyEdit::_hide_metadata_from_inspector);
-		ClassDB::bind_method(D_METHOD("get_root_path"), &AnimationTrackKeyEdit::get_root_path);
-		ClassDB::bind_method(D_METHOD("_dont_undo_redo"), &AnimationTrackKeyEdit::_dont_undo_redo);
-		ClassDB::bind_method(D_METHOD("_is_read_only"), &AnimationTrackKeyEdit::_is_read_only);
-	}
+	Node *root = EditorNode::get_singleton()->get_tree()->get_root();
 
-	void _fix_node_path(Variant &value) {
-		NodePath np = value;
+	Node *np_node = root->get_node(np);
+	ERR_FAIL_COND(!np_node);
 
-		if (np == NodePath()) {
-			return;
-		}
+	Node *edited_node = root->get_node(base);
+	ERR_FAIL_COND(!edited_node);
 
-		Node *root = EditorNode::get_singleton()->get_tree()->get_root();
+	value = edited_node->get_path_to(np_node);
+}
 
-		Node *np_node = root->get_node(np);
-		ERR_FAIL_COND(!np_node);
+void AnimationTrackKeyEdit::_update_obj(const Ref<Animation> &p_anim) {
+	if (setting || animation != p_anim) {
+		return;
+	}
 
-		Node *edited_node = root->get_node(base);
-		ERR_FAIL_COND(!edited_node);
+	notify_change();
+}
 
-		value = edited_node->get_path_to(np_node);
+void AnimationTrackKeyEdit::_key_ofs_changed(const Ref<Animation> &p_anim, float from, float to) {
+	if (animation != p_anim || from != key_ofs) {
+		return;
 	}
 
-	void _update_obj(const Ref<Animation> &p_anim) {
-		if (setting || animation != p_anim) {
-			return;
-		}
+	key_ofs = to;
 
-		notify_change();
+	if (setting) {
+		return;
 	}
 
-	void _key_ofs_changed(const Ref<Animation> &p_anim, float from, float to) {
-		if (animation != p_anim || from != key_ofs) {
-			return;
-		}
+	notify_change();
+}
 
-		key_ofs = to;
+bool AnimationTrackKeyEdit::_set(const StringName &p_name, const Variant &p_value) {
+	int key = animation->track_find_key(track, key_ofs, Animation::FIND_MODE_APPROX);
+	ERR_FAIL_COND_V(key == -1, false);
 
-		if (setting) {
-			return;
-		}
+	String name = p_name;
+	if (name == "easing") {
+		float val = p_value;
+		float prev_val = animation->track_get_key_transition(track, key);
+		setting = true;
+		Ref<EditorUndoRedoManager> &undo_redo = EditorNode::get_undo_redo();
+		undo_redo->create_action(TTR("Animation Change Transition"), UndoRedo::MERGE_ENDS);
+		undo_redo->add_do_method(animation.ptr(), "track_set_key_transition", track, key, val);
+		undo_redo->add_undo_method(animation.ptr(), "track_set_key_transition", track, key, prev_val);
+		undo_redo->add_do_method(this, "_update_obj", animation);
+		undo_redo->add_undo_method(this, "_update_obj", animation);
+		undo_redo->commit_action();
 
-		notify_change();
+		setting = false;
+		return true;
 	}
 
-	bool _set(const StringName &p_name, const Variant &p_value) {
-		int key = animation->track_find_key(track, key_ofs, true);
-		ERR_FAIL_COND_V(key == -1, false);
-
-		String name = p_name;
-		if (name == "time" || name == "frame") {
-			float new_time = p_value;
-
-			if (name == "frame") {
-				float fps = animation->get_step();
-				if (fps > 0) {
-					fps = 1.0 / fps;
+	Ref<EditorUndoRedoManager> &undo_redo = EditorNode::get_undo_redo();
+	switch (animation->track_get_type(track)) {
+		case Animation::TYPE_POSITION_3D:
+		case Animation::TYPE_ROTATION_3D:
+		case Animation::TYPE_SCALE_3D: {
+			if (name == "position" || name == "rotation" || name == "scale") {
+				Variant old = animation->track_get_key_value(track, key);
+				setting = true;
+				String chan;
+				switch (animation->track_get_type(track)) {
+					case Animation::TYPE_POSITION_3D:
+						chan = "Position3D";
+						break;
+					case Animation::TYPE_ROTATION_3D:
+						chan = "Rotation3D";
+						break;
+					case Animation::TYPE_SCALE_3D:
+						chan = "Scale3D";
+						break;
+					default: {
+					}
 				}
-				new_time /= fps;
-			}
 
-			if (new_time == key_ofs) {
+				undo_redo->create_action(vformat(TTR("Animation Change %s"), chan));
+				undo_redo->add_do_method(animation.ptr(), "track_set_key_value", track, key, p_value);
+				undo_redo->add_undo_method(animation.ptr(), "track_set_key_value", track, key, old);
+				undo_redo->add_do_method(this, "_update_obj", animation);
+				undo_redo->add_undo_method(this, "_update_obj", animation);
+				undo_redo->commit_action();
+
+				setting = false;
 				return true;
 			}
 
-			int existing = animation->track_find_key(track, new_time, true);
+		} break;
+		case Animation::TYPE_BLEND_SHAPE:
+		case Animation::TYPE_VALUE: {
+			if (name == "value") {
+				Variant value = p_value;
 
-			setting = true;
-			Ref<EditorUndoRedoManager> &undo_redo = EditorNode::get_undo_redo();
-			undo_redo->create_action(TTR("Animation Change Keyframe Time"), UndoRedo::MERGE_ENDS);
+				if (value.get_type() == Variant::NODE_PATH) {
+					_fix_node_path(value);
+				}
 
-			Variant val = animation->track_get_key_value(track, key);
-			float trans = animation->track_get_key_transition(track, key);
+				setting = true;
+				undo_redo->create_action(TTR("Animation Change Keyframe Value"), UndoRedo::MERGE_ENDS);
+				Variant prev = animation->track_get_key_value(track, key);
+				undo_redo->add_do_method(animation.ptr(), "track_set_key_value", track, key, value);
+				undo_redo->add_undo_method(animation.ptr(), "track_set_key_value", track, key, prev);
+				undo_redo->add_do_method(this, "_update_obj", animation);
+				undo_redo->add_undo_method(this, "_update_obj", animation);
+				undo_redo->commit_action();
 
-			undo_redo->add_do_method(animation.ptr(), "track_remove_key", track, key);
-			undo_redo->add_do_method(animation.ptr(), "track_insert_key", track, new_time, val, trans);
-			undo_redo->add_do_method(this, "_key_ofs_changed", animation, key_ofs, new_time);
-			undo_redo->add_undo_method(animation.ptr(), "track_remove_key_at_time", track, new_time);
-			undo_redo->add_undo_method(animation.ptr(), "track_insert_key", track, key_ofs, val, trans);
-			undo_redo->add_undo_method(this, "_key_ofs_changed", animation, new_time, key_ofs);
+				setting = false;
+				return true;
+			}
+		} break;
+		case Animation::TYPE_METHOD: {
+			Dictionary d_old = animation->track_get_key_value(track, key);
+			Dictionary d_new = d_old.duplicate();
+
+			bool change_notify_deserved = false;
+			bool mergeable = false;
+
+			if (name == "name") {
+				d_new["method"] = p_value;
+			} else if (name == "arg_count") {
+				Vector<Variant> args = d_old["args"];
+				args.resize(p_value);
+				d_new["args"] = args;
+				change_notify_deserved = true;
+			} else if (name.begins_with("args/")) {
+				Vector<Variant> args = d_old["args"];
+				int idx = name.get_slice("/", 1).to_int();
+				ERR_FAIL_INDEX_V(idx, args.size(), false);
+
+				String what = name.get_slice("/", 2);
+				if (what == "type") {
+					Variant::Type t = Variant::Type(int(p_value));
+
+					if (t != args[idx].get_type()) {
+						Callable::CallError err;
+						if (Variant::can_convert(args[idx].get_type(), t)) {
+							Variant old = args[idx];
+							Variant *ptrs[1] = { &old };
+							Variant::construct(t, args.write[idx], (const Variant **)ptrs, 1, err);
+						} else {
+							Variant::construct(t, args.write[idx], nullptr, 0, err);
+						}
+						change_notify_deserved = true;
+						d_new["args"] = args;
+					}
+				} else if (what == "value") {
+					Variant value = p_value;
+					if (value.get_type() == Variant::NODE_PATH) {
+						_fix_node_path(value);
+					}
 
-			if (existing != -1) {
-				Variant v = animation->track_get_key_value(track, existing);
-				trans = animation->track_get_key_transition(track, existing);
-				undo_redo->add_undo_method(animation.ptr(), "track_insert_key", track, new_time, v, trans);
+					args.write[idx] = value;
+					d_new["args"] = args;
+					mergeable = true;
+				}
 			}
-			undo_redo->commit_action();
 
-			setting = false;
-			return true;
-		}
+			if (mergeable) {
+				undo_redo->create_action(TTR("Animation Change Call"), UndoRedo::MERGE_ENDS);
+			} else {
+				undo_redo->create_action(TTR("Animation Change Call"));
+			}
 
-		if (name == "easing") {
-			float val = p_value;
-			float prev_val = animation->track_get_key_transition(track, key);
 			setting = true;
-			Ref<EditorUndoRedoManager> &undo_redo = EditorNode::get_undo_redo();
-			undo_redo->create_action(TTR("Animation Change Transition"), UndoRedo::MERGE_ENDS);
-			undo_redo->add_do_method(animation.ptr(), "track_set_key_transition", track, key, val);
-			undo_redo->add_undo_method(animation.ptr(), "track_set_key_transition", track, key, prev_val);
+			undo_redo->add_do_method(animation.ptr(), "track_set_key_value", track, key, d_new);
+			undo_redo->add_undo_method(animation.ptr(), "track_set_key_value", track, key, d_old);
 			undo_redo->add_do_method(this, "_update_obj", animation);
 			undo_redo->add_undo_method(this, "_update_obj", animation);
 			undo_redo->commit_action();
 
 			setting = false;
+			if (change_notify_deserved) {
+				notify_change();
+			}
 			return true;
-		}
-
-		Ref<EditorUndoRedoManager> &undo_redo = EditorNode::get_undo_redo();
-		switch (animation->track_get_type(track)) {
-			case Animation::TYPE_POSITION_3D:
-			case Animation::TYPE_ROTATION_3D:
-			case Animation::TYPE_SCALE_3D: {
-				if (name == "position" || name == "rotation" || name == "scale") {
-					Variant old = animation->track_get_key_value(track, key);
-					setting = true;
-					String chan;
-					switch (animation->track_get_type(track)) {
-						case Animation::TYPE_POSITION_3D:
-							chan = "Position3D";
-							break;
-						case Animation::TYPE_ROTATION_3D:
-							chan = "Rotation3D";
-							break;
-						case Animation::TYPE_SCALE_3D:
-							chan = "Scale3D";
-							break;
-						default: {
-						}
-					}
-
-					undo_redo->create_action(vformat(TTR("Anim Change %s"), chan));
-					undo_redo->add_do_method(animation.ptr(), "track_set_key_value", track, key, p_value);
-					undo_redo->add_undo_method(animation.ptr(), "track_set_key_value", track, key, old);
-					undo_redo->add_do_method(this, "_update_obj", animation);
-					undo_redo->add_undo_method(this, "_update_obj", animation);
-					undo_redo->commit_action();
+		} break;
+		case Animation::TYPE_BEZIER: {
+			if (name == "value") {
+				const Variant &value = p_value;
 
-					setting = false;
-					return true;
-				}
+				setting = true;
+				undo_redo->create_action(TTR("Animation Change Keyframe Value"), UndoRedo::MERGE_ENDS);
+				float prev = animation->bezier_track_get_key_value(track, key);
+				undo_redo->add_do_method(animation.ptr(), "bezier_track_set_key_value", track, key, value);
+				undo_redo->add_undo_method(animation.ptr(), "bezier_track_set_key_value", track, key, prev);
+				undo_redo->add_do_method(this, "_update_obj", animation);
+				undo_redo->add_undo_method(this, "_update_obj", animation);
+				undo_redo->commit_action();
 
-			} break;
-			case Animation::TYPE_BLEND_SHAPE:
-			case Animation::TYPE_VALUE: {
-				if (name == "value") {
-					Variant value = p_value;
+				setting = false;
+				return true;
+			}
 
-					if (value.get_type() == Variant::NODE_PATH) {
-						_fix_node_path(value);
-					}
+			if (name == "in_handle") {
+				const Variant &value = p_value;
 
-					setting = true;
-					undo_redo->create_action(TTR("Animation Change Keyframe Value"), UndoRedo::MERGE_ENDS);
-					Variant prev = animation->track_get_key_value(track, key);
-					undo_redo->add_do_method(animation.ptr(), "track_set_key_value", track, key, value);
-					undo_redo->add_undo_method(animation.ptr(), "track_set_key_value", track, key, prev);
-					undo_redo->add_do_method(this, "_update_obj", animation);
-					undo_redo->add_undo_method(this, "_update_obj", animation);
-					undo_redo->commit_action();
+				setting = true;
+				undo_redo->create_action(TTR("Animation Change Keyframe Value"), UndoRedo::MERGE_ENDS);
+				Vector2 prev = animation->bezier_track_get_key_in_handle(track, key);
+				undo_redo->add_do_method(animation.ptr(), "bezier_track_set_key_in_handle", track, key, value);
+				undo_redo->add_undo_method(animation.ptr(), "bezier_track_set_key_in_handle", track, key, prev);
+				undo_redo->add_do_method(this, "_update_obj", animation);
+				undo_redo->add_undo_method(this, "_update_obj", animation);
+				undo_redo->commit_action();
 
-					setting = false;
-					return true;
-				}
-			} break;
-			case Animation::TYPE_METHOD: {
-				Dictionary d_old = animation->track_get_key_value(track, key);
-				Dictionary d_new = d_old.duplicate();
+				setting = false;
+				return true;
+			}
 
-				bool change_notify_deserved = false;
-				bool mergeable = false;
+			if (name == "out_handle") {
+				const Variant &value = p_value;
 
-				if (name == "name") {
-					d_new["method"] = p_value;
-				} else if (name == "arg_count") {
-					Vector<Variant> args = d_old["args"];
-					args.resize(p_value);
-					d_new["args"] = args;
-					change_notify_deserved = true;
-				} else if (name.begins_with("args/")) {
-					Vector<Variant> args = d_old["args"];
-					int idx = name.get_slice("/", 1).to_int();
-					ERR_FAIL_INDEX_V(idx, args.size(), false);
-
-					String what = name.get_slice("/", 2);
-					if (what == "type") {
-						Variant::Type t = Variant::Type(int(p_value));
-
-						if (t != args[idx].get_type()) {
-							Callable::CallError err;
-							if (Variant::can_convert(args[idx].get_type(), t)) {
-								Variant old = args[idx];
-								Variant *ptrs[1] = { &old };
-								Variant::construct(t, args.write[idx], (const Variant **)ptrs, 1, err);
-							} else {
-								Variant::construct(t, args.write[idx], nullptr, 0, err);
-							}
-							change_notify_deserved = true;
-							d_new["args"] = args;
-						}
-					} else if (what == "value") {
-						Variant value = p_value;
-						if (value.get_type() == Variant::NODE_PATH) {
-							_fix_node_path(value);
-						}
+				setting = true;
+				undo_redo->create_action(TTR("Animation Change Keyframe Value"), UndoRedo::MERGE_ENDS);
+				Vector2 prev = animation->bezier_track_get_key_out_handle(track, key);
+				undo_redo->add_do_method(animation.ptr(), "bezier_track_set_key_out_handle", track, key, value);
+				undo_redo->add_undo_method(animation.ptr(), "bezier_track_set_key_out_handle", track, key, prev);
+				undo_redo->add_do_method(this, "_update_obj", animation);
+				undo_redo->add_undo_method(this, "_update_obj", animation);
+				undo_redo->commit_action();
 
-						args.write[idx] = value;
-						d_new["args"] = args;
-						mergeable = true;
-					}
-				}
+				setting = false;
+				return true;
+			}
 
-				if (mergeable) {
-					undo_redo->create_action(TTR("Animation Change Call"), UndoRedo::MERGE_ENDS);
-				} else {
-					undo_redo->create_action(TTR("Animation Change Call"));
-				}
+			if (name == "handle_mode") {
+				const Variant &value = p_value;
 
 				setting = true;
-				undo_redo->add_do_method(animation.ptr(), "track_set_key_value", track, key, d_new);
-				undo_redo->add_undo_method(animation.ptr(), "track_set_key_value", track, key, d_old);
+				undo_redo->create_action(TTR("Animation Change Keyframe Value"), UndoRedo::MERGE_ENDS);
+				int prev = animation->bezier_track_get_key_handle_mode(track, key);
+				undo_redo->add_do_method(this, "_bezier_track_set_key_handle_mode", animation.ptr(), track, key, value);
+				undo_redo->add_undo_method(this, "_bezier_track_set_key_handle_mode", animation.ptr(), track, key, prev);
 				undo_redo->add_do_method(this, "_update_obj", animation);
 				undo_redo->add_undo_method(this, "_update_obj", animation);
 				undo_redo->commit_action();
 
 				setting = false;
-				if (change_notify_deserved) {
-					notify_change();
-				}
 				return true;
-			} break;
-			case Animation::TYPE_BEZIER: {
-				if (name == "value") {
-					const Variant &value = p_value;
-
-					setting = true;
-					undo_redo->create_action(TTR("Animation Change Keyframe Value"), UndoRedo::MERGE_ENDS);
-					float prev = animation->bezier_track_get_key_value(track, key);
-					undo_redo->add_do_method(animation.ptr(), "bezier_track_set_key_value", track, key, value);
-					undo_redo->add_undo_method(animation.ptr(), "bezier_track_set_key_value", track, key, prev);
-					undo_redo->add_do_method(this, "_update_obj", animation);
-					undo_redo->add_undo_method(this, "_update_obj", animation);
-					undo_redo->commit_action();
-
-					setting = false;
-					return true;
-				}
+			}
+		} break;
+		case Animation::TYPE_AUDIO: {
+			if (name == "stream") {
+				Ref<AudioStream> stream = p_value;
 
-				if (name == "in_handle") {
-					const Variant &value = p_value;
+				setting = true;
+				undo_redo->create_action(TTR("Animation Change Keyframe Value"), UndoRedo::MERGE_ENDS);
+				Ref<Resource> prev = animation->audio_track_get_key_stream(track, key);
+				undo_redo->add_do_method(animation.ptr(), "audio_track_set_key_stream", track, key, stream);
+				undo_redo->add_undo_method(animation.ptr(), "audio_track_set_key_stream", track, key, prev);
+				undo_redo->add_do_method(this, "_update_obj", animation);
+				undo_redo->add_undo_method(this, "_update_obj", animation);
+				undo_redo->commit_action();
 
-					setting = true;
-					undo_redo->create_action(TTR("Animation Change Keyframe Value"), UndoRedo::MERGE_ENDS);
-					Vector2 prev = animation->bezier_track_get_key_in_handle(track, key);
-					undo_redo->add_do_method(animation.ptr(), "bezier_track_set_key_in_handle", track, key, value);
-					undo_redo->add_undo_method(animation.ptr(), "bezier_track_set_key_in_handle", track, key, prev);
-					undo_redo->add_do_method(this, "_update_obj", animation);
-					undo_redo->add_undo_method(this, "_update_obj", animation);
-					undo_redo->commit_action();
-
-					setting = false;
-					return true;
-				}
+				setting = false;
+				return true;
+			}
 
-				if (name == "out_handle") {
-					const Variant &value = p_value;
+			if (name == "start_offset") {
+				float value = p_value;
 
-					setting = true;
-					undo_redo->create_action(TTR("Animation Change Keyframe Value"), UndoRedo::MERGE_ENDS);
-					Vector2 prev = animation->bezier_track_get_key_out_handle(track, key);
-					undo_redo->add_do_method(animation.ptr(), "bezier_track_set_key_out_handle", track, key, value);
-					undo_redo->add_undo_method(animation.ptr(), "bezier_track_set_key_out_handle", track, key, prev);
-					undo_redo->add_do_method(this, "_update_obj", animation);
-					undo_redo->add_undo_method(this, "_update_obj", animation);
-					undo_redo->commit_action();
-
-					setting = false;
-					return true;
-				}
+				setting = true;
+				undo_redo->create_action(TTR("Animation Change Keyframe Value"), UndoRedo::MERGE_ENDS);
+				float prev = animation->audio_track_get_key_start_offset(track, key);
+				undo_redo->add_do_method(animation.ptr(), "audio_track_set_key_start_offset", track, key, value);
+				undo_redo->add_undo_method(animation.ptr(), "audio_track_set_key_start_offset", track, key, prev);
+				undo_redo->add_do_method(this, "_update_obj", animation);
+				undo_redo->add_undo_method(this, "_update_obj", animation);
+				undo_redo->commit_action();
 
-				if (name == "handle_mode") {
-					const Variant &value = p_value;
+				setting = false;
+				return true;
+			}
 
-					setting = true;
-					undo_redo->create_action(TTR("Animation Change Keyframe Value"), UndoRedo::MERGE_ENDS);
-					int prev = animation->bezier_track_get_key_handle_mode(track, key);
-					undo_redo->add_do_method(this, "_bezier_track_set_key_handle_mode", animation.ptr(), track, key, value);
-					undo_redo->add_undo_method(this, "_bezier_track_set_key_handle_mode", animation.ptr(), track, key, prev);
-					undo_redo->add_do_method(this, "_update_obj", animation);
-					undo_redo->add_undo_method(this, "_update_obj", animation);
-					undo_redo->commit_action();
-
-					setting = false;
-					return true;
-				}
-			} break;
-			case Animation::TYPE_AUDIO: {
-				if (name == "stream") {
-					Ref<AudioStream> stream = p_value;
+			if (name == "end_offset") {
+				float value = p_value;
 
-					setting = true;
-					undo_redo->create_action(TTR("Animation Change Keyframe Value"), UndoRedo::MERGE_ENDS);
-					Ref<Resource> prev = animation->audio_track_get_key_stream(track, key);
-					undo_redo->add_do_method(animation.ptr(), "audio_track_set_key_stream", track, key, stream);
-					undo_redo->add_undo_method(animation.ptr(), "audio_track_set_key_stream", track, key, prev);
-					undo_redo->add_do_method(this, "_update_obj", animation);
-					undo_redo->add_undo_method(this, "_update_obj", animation);
-					undo_redo->commit_action();
-
-					setting = false;
-					return true;
-				}
+				setting = true;
+				undo_redo->create_action(TTR("Animation Change Keyframe Value"), UndoRedo::MERGE_ENDS);
+				float prev = animation->audio_track_get_key_end_offset(track, key);
+				undo_redo->add_do_method(animation.ptr(), "audio_track_set_key_end_offset", track, key, value);
+				undo_redo->add_undo_method(animation.ptr(), "audio_track_set_key_end_offset", track, key, prev);
+				undo_redo->add_do_method(this, "_update_obj", animation);
+				undo_redo->add_undo_method(this, "_update_obj", animation);
+				undo_redo->commit_action();
 
-				if (name == "start_offset") {
-					float value = p_value;
+				setting = false;
+				return true;
+			}
+		} break;
+		case Animation::TYPE_ANIMATION: {
+			if (name == "animation") {
+				StringName anim_name = p_value;
 
-					setting = true;
-					undo_redo->create_action(TTR("Animation Change Keyframe Value"), UndoRedo::MERGE_ENDS);
-					float prev = animation->audio_track_get_key_start_offset(track, key);
-					undo_redo->add_do_method(animation.ptr(), "audio_track_set_key_start_offset", track, key, value);
-					undo_redo->add_undo_method(animation.ptr(), "audio_track_set_key_start_offset", track, key, prev);
-					undo_redo->add_do_method(this, "_update_obj", animation);
-					undo_redo->add_undo_method(this, "_update_obj", animation);
-					undo_redo->commit_action();
-
-					setting = false;
-					return true;
-				}
+				setting = true;
+				undo_redo->create_action(TTR("Animation Change Keyframe Value"), UndoRedo::MERGE_ENDS);
+				StringName prev = animation->animation_track_get_key_animation(track, key);
+				undo_redo->add_do_method(animation.ptr(), "animation_track_set_key_animation", track, key, anim_name);
+				undo_redo->add_undo_method(animation.ptr(), "animation_track_set_key_animation", track, key, prev);
+				undo_redo->add_do_method(this, "_update_obj", animation);
+				undo_redo->add_undo_method(this, "_update_obj", animation);
+				undo_redo->commit_action();
 
-				if (name == "end_offset") {
-					float value = p_value;
+				setting = false;
+				return true;
+			}
+		} break;
+	}
 
-					setting = true;
-					undo_redo->create_action(TTR("Animation Change Keyframe Value"), UndoRedo::MERGE_ENDS);
-					float prev = animation->audio_track_get_key_end_offset(track, key);
-					undo_redo->add_do_method(animation.ptr(), "audio_track_set_key_end_offset", track, key, value);
-					undo_redo->add_undo_method(animation.ptr(), "audio_track_set_key_end_offset", track, key, prev);
-					undo_redo->add_do_method(this, "_update_obj", animation);
-					undo_redo->add_undo_method(this, "_update_obj", animation);
-					undo_redo->commit_action();
-
-					setting = false;
-					return true;
-				}
-			} break;
-			case Animation::TYPE_ANIMATION: {
-				if (name == "animation") {
-					StringName anim_name = p_value;
+	return false;
+}
 
-					setting = true;
-					undo_redo->create_action(TTR("Animation Change Keyframe Value"), UndoRedo::MERGE_ENDS);
-					StringName prev = animation->animation_track_get_key_animation(track, key);
-					undo_redo->add_do_method(animation.ptr(), "animation_track_set_key_animation", track, key, anim_name);
-					undo_redo->add_undo_method(animation.ptr(), "animation_track_set_key_animation", track, key, prev);
-					undo_redo->add_do_method(this, "_update_obj", animation);
-					undo_redo->add_undo_method(this, "_update_obj", animation);
-					undo_redo->commit_action();
-
-					setting = false;
-					return true;
-				}
-			} break;
-		}
+bool AnimationTrackKeyEdit::_get(const StringName &p_name, Variant &r_ret) const {
+	int key = animation->track_find_key(track, key_ofs, Animation::FIND_MODE_APPROX);
+	ERR_FAIL_COND_V(key == -1, false);
 
-		return false;
+	String name = p_name;
+	if (name == "easing") {
+		r_ret = animation->track_get_key_transition(track, key);
+		return true;
 	}
 
-	bool _get(const StringName &p_name, Variant &r_ret) const {
-		int key = animation->track_find_key(track, key_ofs, true);
-		ERR_FAIL_COND_V(key == -1, false);
-
-		String name = p_name;
-		if (name == "time") {
-			r_ret = key_ofs;
-			return true;
-		}
-
-		if (name == "frame") {
-			float fps = animation->get_step();
-			if (fps > 0) {
-				fps = 1.0 / fps;
+	switch (animation->track_get_type(track)) {
+		case Animation::TYPE_POSITION_3D:
+		case Animation::TYPE_ROTATION_3D:
+		case Animation::TYPE_SCALE_3D: {
+			if (name == "position" || name == "rotation" || name == "scale") {
+				r_ret = animation->track_get_key_value(track, key);
+				return true;
+			}
+		} break;
+		case Animation::TYPE_BLEND_SHAPE:
+		case Animation::TYPE_VALUE: {
+			if (name == "value") {
+				r_ret = animation->track_get_key_value(track, key);
+				return true;
 			}
-			r_ret = key_ofs * fps;
-			return true;
-		}
 
-		if (name == "easing") {
-			r_ret = animation->track_get_key_transition(track, key);
-			return true;
-		}
+		} break;
+		case Animation::TYPE_METHOD: {
+			Dictionary d = animation->track_get_key_value(track, key);
 
-		switch (animation->track_get_type(track)) {
-			case Animation::TYPE_POSITION_3D:
-			case Animation::TYPE_ROTATION_3D:
-			case Animation::TYPE_SCALE_3D: {
-				if (name == "position" || name == "rotation" || name == "scale") {
-					r_ret = animation->track_get_key_value(track, key);
-					return true;
-				}
-			} break;
-			case Animation::TYPE_BLEND_SHAPE:
-			case Animation::TYPE_VALUE: {
-				if (name == "value") {
-					r_ret = animation->track_get_key_value(track, key);
-					return true;
-				}
+			if (name == "name") {
+				ERR_FAIL_COND_V(!d.has("method"), false);
+				r_ret = d["method"];
+				return true;
+			}
 
-			} break;
-			case Animation::TYPE_METHOD: {
-				Dictionary d = animation->track_get_key_value(track, key);
+			ERR_FAIL_COND_V(!d.has("args"), false);
 
-				if (name == "name") {
-					ERR_FAIL_COND_V(!d.has("method"), false);
-					r_ret = d["method"];
-					return true;
-				}
+			Vector<Variant> args = d["args"];
 
-				ERR_FAIL_COND_V(!d.has("args"), false);
+			if (name == "arg_count") {
+				r_ret = args.size();
+				return true;
+			}
 
-				Vector<Variant> args = d["args"];
+			if (name.begins_with("args/")) {
+				int idx = name.get_slice("/", 1).to_int();
+				ERR_FAIL_INDEX_V(idx, args.size(), false);
 
-				if (name == "arg_count") {
-					r_ret = args.size();
+				String what = name.get_slice("/", 2);
+				if (what == "type") {
+					r_ret = args[idx].get_type();
 					return true;
 				}
 
-				if (name.begins_with("args/")) {
-					int idx = name.get_slice("/", 1).to_int();
-					ERR_FAIL_INDEX_V(idx, args.size(), false);
-
-					String what = name.get_slice("/", 2);
-					if (what == "type") {
-						r_ret = args[idx].get_type();
-						return true;
-					}
-
-					if (what == "value") {
-						r_ret = args[idx];
-						return true;
-					}
-				}
-
-			} break;
-			case Animation::TYPE_BEZIER: {
-				if (name == "value") {
-					r_ret = animation->bezier_track_get_key_value(track, key);
+				if (what == "value") {
+					r_ret = args[idx];
 					return true;
 				}
+			}
 
-				if (name == "in_handle") {
-					r_ret = animation->bezier_track_get_key_in_handle(track, key);
-					return true;
-				}
+		} break;
+		case Animation::TYPE_BEZIER: {
+			if (name == "value") {
+				r_ret = animation->bezier_track_get_key_value(track, key);
+				return true;
+			}
 
-				if (name == "out_handle") {
-					r_ret = animation->bezier_track_get_key_out_handle(track, key);
-					return true;
-				}
+			if (name == "in_handle") {
+				r_ret = animation->bezier_track_get_key_in_handle(track, key);
+				return true;
+			}
 
-				if (name == "handle_mode") {
-					r_ret = animation->bezier_track_get_key_handle_mode(track, key);
-					return true;
-				}
+			if (name == "out_handle") {
+				r_ret = animation->bezier_track_get_key_out_handle(track, key);
+				return true;
+			}
 
-			} break;
-			case Animation::TYPE_AUDIO: {
-				if (name == "stream") {
-					r_ret = animation->audio_track_get_key_stream(track, key);
-					return true;
-				}
+			if (name == "handle_mode") {
+				r_ret = animation->bezier_track_get_key_handle_mode(track, key);
+				return true;
+			}
 
-				if (name == "start_offset") {
-					r_ret = animation->audio_track_get_key_start_offset(track, key);
-					return true;
-				}
+		} break;
+		case Animation::TYPE_AUDIO: {
+			if (name == "stream") {
+				r_ret = animation->audio_track_get_key_stream(track, key);
+				return true;
+			}
 
-				if (name == "end_offset") {
-					r_ret = animation->audio_track_get_key_end_offset(track, key);
-					return true;
-				}
+			if (name == "start_offset") {
+				r_ret = animation->audio_track_get_key_start_offset(track, key);
+				return true;
+			}
 
-			} break;
-			case Animation::TYPE_ANIMATION: {
-				if (name == "animation") {
-					r_ret = animation->animation_track_get_key_animation(track, key);
-					return true;
-				}
+			if (name == "end_offset") {
+				r_ret = animation->audio_track_get_key_end_offset(track, key);
+				return true;
+			}
 
-			} break;
-		}
+		} break;
+		case Animation::TYPE_ANIMATION: {
+			if (name == "animation") {
+				r_ret = animation->animation_track_get_key_animation(track, key);
+				return true;
+			}
 
-		return false;
+		} break;
 	}
-	void _get_property_list(List<PropertyInfo> *p_list) const {
-		if (animation.is_null()) {
-			return;
-		}
 
-		ERR_FAIL_INDEX(track, animation->get_track_count());
-		int key = animation->track_find_key(track, key_ofs, true);
-		ERR_FAIL_COND(key == -1);
+	return false;
+}
 
-		if (use_fps && animation->get_step() > 0) {
-			float max_frame = animation->get_length() / animation->get_step();
-			p_list->push_back(PropertyInfo(Variant::FLOAT, PNAME("frame"), PROPERTY_HINT_RANGE, "0," + rtos(max_frame) + ",1"));
-		} else {
-			p_list->push_back(PropertyInfo(Variant::FLOAT, PNAME("time"), PROPERTY_HINT_RANGE, "0," + rtos(animation->get_length()) + ",0.01"));
-		}
+void AnimationTrackKeyEdit::_get_property_list(List<PropertyInfo> *p_list) const {
+	if (animation.is_null()) {
+		return;
+	}
 
-		switch (animation->track_get_type(track)) {
-			case Animation::TYPE_POSITION_3D: {
-				p_list->push_back(PropertyInfo(Variant::VECTOR3, PNAME("position")));
-			} break;
-			case Animation::TYPE_ROTATION_3D: {
-				p_list->push_back(PropertyInfo(Variant::QUATERNION, PNAME("rotation")));
-			} break;
-			case Animation::TYPE_SCALE_3D: {
-				p_list->push_back(PropertyInfo(Variant::VECTOR3, PNAME("scale")));
-			} break;
-			case Animation::TYPE_BLEND_SHAPE: {
-				p_list->push_back(PropertyInfo(Variant::FLOAT, PNAME("value")));
-			} break;
-			case Animation::TYPE_VALUE: {
-				Variant v = animation->track_get_key_value(track, key);
+	ERR_FAIL_INDEX(track, animation->get_track_count());
+	int key = animation->track_find_key(track, key_ofs, Animation::FIND_MODE_APPROX);
+	ERR_FAIL_COND(key == -1);
 
-				if (hint.type != Variant::NIL) {
-					PropertyInfo pi = hint;
-					pi.name = PNAME("value");
-					p_list->push_back(pi);
-				} else {
-					PropertyHint val_hint = PROPERTY_HINT_NONE;
-					String val_hint_string;
-
-					if (v.get_type() == Variant::OBJECT) {
-						// Could actually check the object property if exists..? Yes I will!
-						Ref<Resource> res = v;
-						if (res.is_valid()) {
-							val_hint = PROPERTY_HINT_RESOURCE_TYPE;
-							val_hint_string = res->get_class();
-						}
-					}
+	switch (animation->track_get_type(track)) {
+		case Animation::TYPE_POSITION_3D: {
+			p_list->push_back(PropertyInfo(Variant::VECTOR3, PNAME("position")));
+		} break;
+		case Animation::TYPE_ROTATION_3D: {
+			p_list->push_back(PropertyInfo(Variant::QUATERNION, PNAME("rotation")));
+		} break;
+		case Animation::TYPE_SCALE_3D: {
+			p_list->push_back(PropertyInfo(Variant::VECTOR3, PNAME("scale")));
+		} break;
+		case Animation::TYPE_BLEND_SHAPE: {
+			p_list->push_back(PropertyInfo(Variant::FLOAT, PNAME("value")));
+		} break;
+		case Animation::TYPE_VALUE: {
+			Variant v = animation->track_get_key_value(track, key);
 
-					if (v.get_type() != Variant::NIL) {
-						p_list->push_back(PropertyInfo(v.get_type(), PNAME("value"), val_hint, val_hint_string));
+			if (hint.type != Variant::NIL) {
+				PropertyInfo pi = hint;
+				pi.name = PNAME("value");
+				p_list->push_back(pi);
+			} else {
+				PropertyHint val_hint = PROPERTY_HINT_NONE;
+				String val_hint_string;
+
+				if (v.get_type() == Variant::OBJECT) {
+					// Could actually check the object property if exists..? Yes I will!
+					Ref<Resource> res = v;
+					if (res.is_valid()) {
+						val_hint = PROPERTY_HINT_RESOURCE_TYPE;
+						val_hint_string = res->get_class();
 					}
 				}
 
-			} break;
-			case Animation::TYPE_METHOD: {
-				p_list->push_back(PropertyInfo(Variant::STRING_NAME, PNAME("name")));
-				p_list->push_back(PropertyInfo(Variant::INT, PNAME("arg_count"), PROPERTY_HINT_RANGE, "0,32,1,or_greater"));
-
-				Dictionary d = animation->track_get_key_value(track, key);
-				ERR_FAIL_COND(!d.has("args"));
-				Vector<Variant> args = d["args"];
-				String vtypes;
-				for (int i = 0; i < Variant::VARIANT_MAX; i++) {
-					if (i > 0) {
-						vtypes += ",";
-					}
-					vtypes += Variant::get_type_name(Variant::Type(i));
+				if (v.get_type() != Variant::NIL) {
+					p_list->push_back(PropertyInfo(v.get_type(), PNAME("value"), val_hint, val_hint_string));
 				}
+			}
 
-				for (int i = 0; i < args.size(); i++) {
-					p_list->push_back(PropertyInfo(Variant::INT, vformat("%s/%d/%s", PNAME("args"), i, PNAME("type")), PROPERTY_HINT_ENUM, vtypes));
-					if (args[i].get_type() != Variant::NIL) {
-						p_list->push_back(PropertyInfo(args[i].get_type(), vformat("%s/%d/%s", PNAME("args"), i, PNAME("value"))));
-					}
+		} break;
+		case Animation::TYPE_METHOD: {
+			p_list->push_back(PropertyInfo(Variant::STRING_NAME, PNAME("name")));
+			p_list->push_back(PropertyInfo(Variant::INT, PNAME("arg_count"), PROPERTY_HINT_RANGE, "0,32,1,or_greater"));
+
+			Dictionary d = animation->track_get_key_value(track, key);
+			ERR_FAIL_COND(!d.has("args"));
+			Vector<Variant> args = d["args"];
+			String vtypes;
+			for (int i = 0; i < Variant::VARIANT_MAX; i++) {
+				if (i > 0) {
+					vtypes += ",";
 				}
+				vtypes += Variant::get_type_name(Variant::Type(i));
+			}
 
-			} break;
-			case Animation::TYPE_BEZIER: {
-				Animation::HandleMode hm = animation->bezier_track_get_key_handle_mode(track, key);
-				p_list->push_back(PropertyInfo(Variant::FLOAT, PNAME("value")));
-				if (hm == Animation::HANDLE_MODE_LINEAR) {
-					p_list->push_back(PropertyInfo(Variant::VECTOR2, PNAME("in_handle"), PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_READ_ONLY));
-					p_list->push_back(PropertyInfo(Variant::VECTOR2, PNAME("out_handle"), PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_READ_ONLY));
-				} else {
-					p_list->push_back(PropertyInfo(Variant::VECTOR2, PNAME("in_handle")));
-					p_list->push_back(PropertyInfo(Variant::VECTOR2, PNAME("out_handle")));
+			for (int i = 0; i < args.size(); i++) {
+				p_list->push_back(PropertyInfo(Variant::INT, vformat("%s/%d/%s", PNAME("args"), i, PNAME("type")), PROPERTY_HINT_ENUM, vtypes));
+				if (args[i].get_type() != Variant::NIL) {
+					p_list->push_back(PropertyInfo(args[i].get_type(), vformat("%s/%d/%s", PNAME("args"), i, PNAME("value"))));
 				}
-				p_list->push_back(PropertyInfo(Variant::INT, PNAME("handle_mode"), PROPERTY_HINT_ENUM, "Free,Linear,Balanced,Mirrored"));
-
-			} break;
-			case Animation::TYPE_AUDIO: {
-				p_list->push_back(PropertyInfo(Variant::OBJECT, PNAME("stream"), PROPERTY_HINT_RESOURCE_TYPE, "AudioStream"));
-				p_list->push_back(PropertyInfo(Variant::FLOAT, PNAME("start_offset"), PROPERTY_HINT_RANGE, "0,3600,0.01,or_greater"));
-				p_list->push_back(PropertyInfo(Variant::FLOAT, PNAME("end_offset"), PROPERTY_HINT_RANGE, "0,3600,0.01,or_greater"));
+			}
 
-			} break;
-			case Animation::TYPE_ANIMATION: {
-				String animations;
+		} break;
+		case Animation::TYPE_BEZIER: {
+			Animation::HandleMode hm = animation->bezier_track_get_key_handle_mode(track, key);
+			p_list->push_back(PropertyInfo(Variant::FLOAT, PNAME("value")));
+			if (hm == Animation::HANDLE_MODE_LINEAR) {
+				p_list->push_back(PropertyInfo(Variant::VECTOR2, PNAME("in_handle"), PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_READ_ONLY));
+				p_list->push_back(PropertyInfo(Variant::VECTOR2, PNAME("out_handle"), PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_READ_ONLY));
+			} else {
+				p_list->push_back(PropertyInfo(Variant::VECTOR2, PNAME("in_handle")));
+				p_list->push_back(PropertyInfo(Variant::VECTOR2, PNAME("out_handle")));
+			}
+			p_list->push_back(PropertyInfo(Variant::INT, PNAME("handle_mode"), PROPERTY_HINT_ENUM, "Free,Linear,Balanced,Mirrored"));
 
-				if (root_path && root_path->has_node(animation->track_get_path(track))) {
-					AnimationPlayer *ap = Object::cast_to<AnimationPlayer>(root_path->get_node(animation->track_get_path(track)));
-					if (ap) {
-						List<StringName> anims;
-						ap->get_animation_list(&anims);
-						for (const StringName &E : anims) {
-							if (!animations.is_empty()) {
-								animations += ",";
-							}
+		} break;
+		case Animation::TYPE_AUDIO: {
+			p_list->push_back(PropertyInfo(Variant::OBJECT, PNAME("stream"), PROPERTY_HINT_RESOURCE_TYPE, "AudioStream"));
+			p_list->push_back(PropertyInfo(Variant::FLOAT, PNAME("start_offset"), PROPERTY_HINT_RANGE, "0,3600,0.0001,or_greater"));
+			p_list->push_back(PropertyInfo(Variant::FLOAT, PNAME("end_offset"), PROPERTY_HINT_RANGE, "0,3600,0.0001,or_greater"));
 
-							animations += String(E);
+		} break;
+		case Animation::TYPE_ANIMATION: {
+			String animations;
+
+			if (root_path && root_path->has_node(animation->track_get_path(track))) {
+				AnimationPlayer *ap = Object::cast_to<AnimationPlayer>(root_path->get_node(animation->track_get_path(track)));
+				if (ap) {
+					List<StringName> anims;
+					ap->get_animation_list(&anims);
+					for (const StringName &E : anims) {
+						if (!animations.is_empty()) {
+							animations += ",";
 						}
+
+						animations += String(E);
 					}
 				}
+			}
 
-				if (!animations.is_empty()) {
-					animations += ",";
-				}
-				animations += "[stop]";
+			if (!animations.is_empty()) {
+				animations += ",";
+			}
+			animations += "[stop]";
 
-				p_list->push_back(PropertyInfo(Variant::STRING_NAME, PNAME("animation"), PROPERTY_HINT_ENUM, animations));
+			p_list->push_back(PropertyInfo(Variant::STRING_NAME, PNAME("animation"), PROPERTY_HINT_ENUM, animations));
 
-			} break;
-		}
+		} break;
+	}
 
-		if (animation->track_get_type(track) == Animation::TYPE_VALUE) {
-			p_list->push_back(PropertyInfo(Variant::FLOAT, PNAME("easing"), PROPERTY_HINT_EXP_EASING));
-		}
+	if (animation->track_get_type(track) == Animation::TYPE_VALUE) {
+		p_list->push_back(PropertyInfo(Variant::FLOAT, PNAME("easing"), PROPERTY_HINT_EXP_EASING));
 	}
+}
 
-	Ref<Animation> animation;
-	int track = -1;
-	float key_ofs = 0;
-	Node *root_path = nullptr;
+void AnimationTrackKeyEdit::notify_change() {
+	notify_property_list_changed();
+}
 
-	PropertyInfo hint;
-	NodePath base;
-	bool use_fps = false;
+Node *AnimationTrackKeyEdit::get_root_path() {
+	return root_path;
+}
 
-	void notify_change() {
-		notify_property_list_changed();
-	}
+void AnimationTrackKeyEdit::set_use_fps(bool p_enable) {
+	use_fps = p_enable;
+	notify_property_list_changed();
+}
 
-	Node *get_root_path() {
-		return root_path;
-	}
+void AnimationMultiTrackKeyEdit::_bind_methods() {
+	ClassDB::bind_method(D_METHOD("_update_obj"), &AnimationMultiTrackKeyEdit::_update_obj);
+	ClassDB::bind_method(D_METHOD("_key_ofs_changed"), &AnimationMultiTrackKeyEdit::_key_ofs_changed);
+	ClassDB::bind_method(D_METHOD("_hide_script_from_inspector"), &AnimationMultiTrackKeyEdit::_hide_script_from_inspector);
+	ClassDB::bind_method(D_METHOD("_hide_metadata_from_inspector"), &AnimationMultiTrackKeyEdit::_hide_metadata_from_inspector);
+	ClassDB::bind_method(D_METHOD("get_root_path"), &AnimationMultiTrackKeyEdit::get_root_path);
+	ClassDB::bind_method(D_METHOD("_dont_undo_redo"), &AnimationMultiTrackKeyEdit::_dont_undo_redo);
+	ClassDB::bind_method(D_METHOD("_is_read_only"), &AnimationMultiTrackKeyEdit::_is_read_only);
+}
 
-	void set_use_fps(bool p_enable) {
-		use_fps = p_enable;
-		notify_property_list_changed();
+void AnimationMultiTrackKeyEdit::_fix_node_path(Variant &value, NodePath &base) {
+	NodePath np = value;
+
+	if (np == NodePath()) {
+		return;
 	}
-};
 
-class AnimationMultiTrackKeyEdit : public Object {
-	GDCLASS(AnimationMultiTrackKeyEdit, Object);
+	Node *root = EditorNode::get_singleton()->get_tree()->get_root();
 
-public:
-	bool setting = false;
-	bool animation_read_only = false;
+	Node *np_node = root->get_node(np);
+	ERR_FAIL_COND(!np_node);
 
-	bool _hide_script_from_inspector() { return true; }
-	bool _hide_metadata_from_inspector() { return true; }
-	bool _dont_undo_redo() { return true; }
+	Node *edited_node = root->get_node(base);
+	ERR_FAIL_COND(!edited_node);
 
-	bool _is_read_only() {
-		return animation_read_only;
-	}
+	value = edited_node->get_path_to(np_node);
+}
 
-	static void _bind_methods() {
-		ClassDB::bind_method(D_METHOD("_update_obj"), &AnimationMultiTrackKeyEdit::_update_obj);
-		ClassDB::bind_method(D_METHOD("_key_ofs_changed"), &AnimationMultiTrackKeyEdit::_key_ofs_changed);
-		ClassDB::bind_method(D_METHOD("_hide_script_from_inspector"), &AnimationMultiTrackKeyEdit::_hide_script_from_inspector);
-		ClassDB::bind_method(D_METHOD("_hide_metadata_from_inspector"), &AnimationMultiTrackKeyEdit::_hide_metadata_from_inspector);
-		ClassDB::bind_method(D_METHOD("get_root_path"), &AnimationMultiTrackKeyEdit::get_root_path);
-		ClassDB::bind_method(D_METHOD("_dont_undo_redo"), &AnimationMultiTrackKeyEdit::_dont_undo_redo);
-		ClassDB::bind_method(D_METHOD("_is_read_only"), &AnimationMultiTrackKeyEdit::_is_read_only);
+void AnimationMultiTrackKeyEdit::_update_obj(const Ref<Animation> &p_anim) {
+	if (setting || animation != p_anim) {
+		return;
 	}
 
-	void _fix_node_path(Variant &value, NodePath &base) {
-		NodePath np = value;
+	notify_change();
+}
 
-		if (np == NodePath()) {
-			return;
-		}
+void AnimationMultiTrackKeyEdit::_key_ofs_changed(const Ref<Animation> &p_anim, float from, float to) {
+	if (animation != p_anim) {
+		return;
+	}
 
-		Node *root = EditorNode::get_singleton()->get_tree()->get_root();
+	for (const KeyValue<int, List<float>> &E : key_ofs_map) {
+		int key = 0;
+		for (const float &key_ofs : E.value) {
+			if (from != key_ofs) {
+				key++;
+				continue;
+			}
 
-		Node *np_node = root->get_node(np);
-		ERR_FAIL_COND(!np_node);
+			int track = E.key;
+			key_ofs_map[track][key] = to;
 
-		Node *edited_node = root->get_node(base);
-		ERR_FAIL_COND(!edited_node);
+			if (setting) {
+				return;
+			}
 
-		value = edited_node->get_path_to(np_node);
-	}
+			notify_change();
 
-	void _update_obj(const Ref<Animation> &p_anim) {
-		if (setting || animation != p_anim) {
 			return;
 		}
-
-		notify_change();
 	}
+}
 
-	void _key_ofs_changed(const Ref<Animation> &p_anim, float from, float to) {
-		if (animation != p_anim) {
-			return;
-		}
-
-		for (const KeyValue<int, List<float>> &E : key_ofs_map) {
-			int key = 0;
-			for (const float &key_ofs : E.value) {
-				if (from != key_ofs) {
-					key++;
-					continue;
-				}
+bool AnimationMultiTrackKeyEdit::_set(const StringName &p_name, const Variant &p_value) {
+	bool update_obj = false;
+	bool change_notify_deserved = false;
+	for (const KeyValue<int, List<float>> &E : key_ofs_map) {
+		int track = E.key;
+		for (const float &key_ofs : E.value) {
+			int key = animation->track_find_key(track, key_ofs, Animation::FIND_MODE_APPROX);
+			ERR_FAIL_COND_V(key == -1, false);
 
-				int track = E.key;
-				key_ofs_map[track][key] = to;
+			String name = p_name;
+			if (name == "easing") {
+				float val = p_value;
+				float prev_val = animation->track_get_key_transition(track, key);
 
-				if (setting) {
-					return;
+				Ref<EditorUndoRedoManager> &undo_redo = EditorNode::get_undo_redo();
+				if (!setting) {
+					setting = true;
+					undo_redo->create_action(TTR("Animation Multi Change Transition"), UndoRedo::MERGE_ENDS);
 				}
-
-				notify_change();
-
-				return;
+				undo_redo->add_do_method(animation.ptr(), "track_set_key_transition", track, key, val);
+				undo_redo->add_undo_method(animation.ptr(), "track_set_key_transition", track, key, prev_val);
+				update_obj = true;
 			}
-		}
-	}
 
-	bool _set(const StringName &p_name, const Variant &p_value) {
-		bool update_obj = false;
-		bool change_notify_deserved = false;
-		for (const KeyValue<int, List<float>> &E : key_ofs_map) {
-			int track = E.key;
-			for (const float &key_ofs : E.value) {
-				int key = animation->track_find_key(track, key_ofs, true);
-				ERR_FAIL_COND_V(key == -1, false);
-
-				String name = p_name;
-				if (name == "time" || name == "frame") {
-					float new_time = p_value;
-
-					if (name == "frame") {
-						float fps = animation->get_step();
-						if (fps > 0) {
-							fps = 1.0 / fps;
+			Ref<EditorUndoRedoManager> &undo_redo = EditorNode::get_undo_redo();
+			switch (animation->track_get_type(track)) {
+				case Animation::TYPE_POSITION_3D:
+				case Animation::TYPE_ROTATION_3D:
+				case Animation::TYPE_SCALE_3D: {
+					Variant old = animation->track_get_key_value(track, key);
+					if (!setting) {
+						String chan;
+						switch (animation->track_get_type(track)) {
+							case Animation::TYPE_POSITION_3D:
+								chan = "Position3D";
+								break;
+							case Animation::TYPE_ROTATION_3D:
+								chan = "Rotation3D";
+								break;
+							case Animation::TYPE_SCALE_3D:
+								chan = "Scale3D";
+								break;
+							default: {
+							}
 						}
-						new_time /= fps;
-					}
-
-					int existing = animation->track_find_key(track, new_time, true);
 
-					Ref<EditorUndoRedoManager> &undo_redo = EditorNode::get_undo_redo();
-					if (!setting) {
 						setting = true;
-						undo_redo->create_action(TTR("Animation Multi Change Keyframe Time"), UndoRedo::MERGE_ENDS);
+						undo_redo->create_action(vformat(TTR("Animation Multi Change %s"), chan));
 					}
+					undo_redo->add_do_method(animation.ptr(), "track_set_key_value", track, key, p_value);
+					undo_redo->add_undo_method(animation.ptr(), "track_set_key_value", track, key, old);
+					update_obj = true;
+				} break;
+				case Animation::TYPE_BLEND_SHAPE:
+				case Animation::TYPE_VALUE: {
+					if (name == "value") {
+						Variant value = p_value;
 
-					Variant val = animation->track_get_key_value(track, key);
-					float trans = animation->track_get_key_transition(track, key);
-
-					undo_redo->add_do_method(animation.ptr(), "track_remove_key", track, key);
-					undo_redo->add_do_method(animation.ptr(), "track_insert_key", track, new_time, val, trans);
-					undo_redo->add_do_method(this, "_key_ofs_changed", animation, key_ofs, new_time);
-					undo_redo->add_undo_method(animation.ptr(), "track_remove_key_at_time", track, new_time);
-					undo_redo->add_undo_method(animation.ptr(), "track_insert_key", track, key_ofs, val, trans);
-					undo_redo->add_undo_method(this, "_key_ofs_changed", animation, new_time, key_ofs);
+						if (value.get_type() == Variant::NODE_PATH) {
+							_fix_node_path(value, base_map[track]);
+						}
 
-					if (existing != -1) {
-						Variant v = animation->track_get_key_value(track, existing);
-						trans = animation->track_get_key_transition(track, existing);
-						undo_redo->add_undo_method(animation.ptr(), "track_insert_key", track, new_time, v, trans);
+						if (!setting) {
+							setting = true;
+							undo_redo->create_action(TTR("Animation Multi Change Keyframe Value"), UndoRedo::MERGE_ENDS);
+						}
+						Variant prev = animation->track_get_key_value(track, key);
+						undo_redo->add_do_method(animation.ptr(), "track_set_key_value", track, key, value);
+						undo_redo->add_undo_method(animation.ptr(), "track_set_key_value", track, key, prev);
+						update_obj = true;
 					}
-				} else if (name == "easing") {
-					float val = p_value;
-					float prev_val = animation->track_get_key_transition(track, key);
+				} break;
+				case Animation::TYPE_METHOD: {
+					Dictionary d_old = animation->track_get_key_value(track, key);
+					Dictionary d_new = d_old.duplicate();
 
-					Ref<EditorUndoRedoManager> &undo_redo = EditorNode::get_undo_redo();
-					if (!setting) {
-						setting = true;
-						undo_redo->create_action(TTR("Animation Multi Change Transition"), UndoRedo::MERGE_ENDS);
-					}
-					undo_redo->add_do_method(animation.ptr(), "track_set_key_transition", track, key, val);
-					undo_redo->add_undo_method(animation.ptr(), "track_set_key_transition", track, key, prev_val);
-					update_obj = true;
-				}
+					bool mergeable = false;
 
-				Ref<EditorUndoRedoManager> &undo_redo = EditorNode::get_undo_redo();
-				switch (animation->track_get_type(track)) {
-					case Animation::TYPE_POSITION_3D:
-					case Animation::TYPE_ROTATION_3D:
-					case Animation::TYPE_SCALE_3D: {
-						Variant old = animation->track_get_key_value(track, key);
-						if (!setting) {
-							String chan;
-							switch (animation->track_get_type(track)) {
-								case Animation::TYPE_POSITION_3D:
-									chan = "Position3D";
-									break;
-								case Animation::TYPE_ROTATION_3D:
-									chan = "Rotation3D";
-									break;
-								case Animation::TYPE_SCALE_3D:
-									chan = "Scale3D";
-									break;
-								default: {
+					if (name == "name") {
+						d_new["method"] = p_value;
+					} else if (name == "arg_count") {
+						Vector<Variant> args = d_old["args"];
+						args.resize(p_value);
+						d_new["args"] = args;
+						change_notify_deserved = true;
+					} else if (name.begins_with("args/")) {
+						Vector<Variant> args = d_old["args"];
+						int idx = name.get_slice("/", 1).to_int();
+						ERR_FAIL_INDEX_V(idx, args.size(), false);
+
+						String what = name.get_slice("/", 2);
+						if (what == "type") {
+							Variant::Type t = Variant::Type(int(p_value));
+
+							if (t != args[idx].get_type()) {
+								Callable::CallError err;
+								if (Variant::can_convert(args[idx].get_type(), t)) {
+									Variant old = args[idx];
+									Variant *ptrs[1] = { &old };
+									Variant::construct(t, args.write[idx], (const Variant **)ptrs, 1, err);
+								} else {
+									Variant::construct(t, args.write[idx], nullptr, 0, err);
 								}
+								change_notify_deserved = true;
+								d_new["args"] = args;
 							}
-
-							setting = true;
-							undo_redo->create_action(vformat(TTR("Animation Multi Change %s"), chan));
-						}
-						undo_redo->add_do_method(animation.ptr(), "track_set_key_value", track, key, p_value);
-						undo_redo->add_undo_method(animation.ptr(), "track_set_key_value", track, key, old);
-						update_obj = true;
-					} break;
-					case Animation::TYPE_BLEND_SHAPE:
-					case Animation::TYPE_VALUE: {
-						if (name == "value") {
+						} else if (what == "value") {
 							Variant value = p_value;
-
 							if (value.get_type() == Variant::NODE_PATH) {
 								_fix_node_path(value, base_map[track]);
 							}
 
-							if (!setting) {
-								setting = true;
-								undo_redo->create_action(TTR("Animation Multi Change Keyframe Value"), UndoRedo::MERGE_ENDS);
-							}
-							Variant prev = animation->track_get_key_value(track, key);
-							undo_redo->add_do_method(animation.ptr(), "track_set_key_value", track, key, value);
-							undo_redo->add_undo_method(animation.ptr(), "track_set_key_value", track, key, prev);
-							update_obj = true;
+							args.write[idx] = value;
+							d_new["args"] = args;
+							mergeable = true;
 						}
-					} break;
-					case Animation::TYPE_METHOD: {
-						Dictionary d_old = animation->track_get_key_value(track, key);
-						Dictionary d_new = d_old.duplicate();
+					}
 
-						bool mergeable = false;
+					Variant prev = animation->track_get_key_value(track, key);
 
-						if (name == "name") {
-							d_new["method"] = p_value;
-						} else if (name == "arg_count") {
-							Vector<Variant> args = d_old["args"];
-							args.resize(p_value);
-							d_new["args"] = args;
-							change_notify_deserved = true;
-						} else if (name.begins_with("args/")) {
-							Vector<Variant> args = d_old["args"];
-							int idx = name.get_slice("/", 1).to_int();
-							ERR_FAIL_INDEX_V(idx, args.size(), false);
-
-							String what = name.get_slice("/", 2);
-							if (what == "type") {
-								Variant::Type t = Variant::Type(int(p_value));
-
-								if (t != args[idx].get_type()) {
-									Callable::CallError err;
-									if (Variant::can_convert(args[idx].get_type(), t)) {
-										Variant old = args[idx];
-										Variant *ptrs[1] = { &old };
-										Variant::construct(t, args.write[idx], (const Variant **)ptrs, 1, err);
-									} else {
-										Variant::construct(t, args.write[idx], nullptr, 0, err);
-									}
-									change_notify_deserved = true;
-									d_new["args"] = args;
-								}
-							} else if (what == "value") {
-								Variant value = p_value;
-								if (value.get_type() == Variant::NODE_PATH) {
-									_fix_node_path(value, base_map[track]);
-								}
+					if (!setting) {
+						if (mergeable) {
+							undo_redo->create_action(TTR("Animation Multi Change Call"), UndoRedo::MERGE_ENDS);
+						} else {
+							undo_redo->create_action(TTR("Animation Multi Change Call"));
+						}
 
-								args.write[idx] = value;
-								d_new["args"] = args;
-								mergeable = true;
-							}
+						setting = true;
+					}
+
+					undo_redo->add_do_method(animation.ptr(), "track_set_key_value", track, key, d_new);
+					undo_redo->add_undo_method(animation.ptr(), "track_set_key_value", track, key, d_old);
+					update_obj = true;
+				} break;
+				case Animation::TYPE_BEZIER: {
+					if (name == "value") {
+						const Variant &value = p_value;
+
+						if (!setting) {
+							setting = true;
+							undo_redo->create_action(TTR("Animation Multi Change Keyframe Value"), UndoRedo::MERGE_ENDS);
 						}
+						float prev = animation->bezier_track_get_key_value(track, key);
+						undo_redo->add_do_method(animation.ptr(), "bezier_track_set_key_value", track, key, value);
+						undo_redo->add_undo_method(animation.ptr(), "bezier_track_set_key_value", track, key, prev);
+						update_obj = true;
+					} else if (name == "in_handle") {
+						const Variant &value = p_value;
 
-						Variant prev = animation->track_get_key_value(track, key);
+						if (!setting) {
+							setting = true;
+							undo_redo->create_action(TTR("Animation Multi Change Keyframe Value"), UndoRedo::MERGE_ENDS);
+						}
+						Vector2 prev = animation->bezier_track_get_key_in_handle(track, key);
+						undo_redo->add_do_method(this, "_bezier_track_set_key_in_handle", track, key, value);
+						undo_redo->add_undo_method(this, "_bezier_track_set_key_in_handle", track, key, prev);
+						update_obj = true;
+					} else if (name == "out_handle") {
+						const Variant &value = p_value;
 
 						if (!setting) {
-							if (mergeable) {
-								undo_redo->create_action(TTR("Animation Multi Change Call"), UndoRedo::MERGE_ENDS);
-							} else {
-								undo_redo->create_action(TTR("Animation Multi Change Call"));
-							}
+							setting = true;
+							undo_redo->create_action(TTR("Animation Multi Change Keyframe Value"), UndoRedo::MERGE_ENDS);
+						}
+						Vector2 prev = animation->bezier_track_get_key_out_handle(track, key);
+						undo_redo->add_do_method(this, "_bezier_track_set_key_out_handle", track, key, value);
+						undo_redo->add_undo_method(this, "_bezier_track_set_key_out_handle", track, key, prev);
+						update_obj = true;
+					} else if (name == "handle_mode") {
+						const Variant &value = p_value;
 
+						if (!setting) {
 							setting = true;
+							undo_redo->create_action(TTR("Animation Multi Change Keyframe Value"), UndoRedo::MERGE_ENDS);
 						}
+						int prev = animation->bezier_track_get_key_handle_mode(track, key);
+						undo_redo->add_do_method(this, "_bezier_track_set_key_handle_mode", animation.ptr(), track, key, value);
+						undo_redo->add_undo_method(this, "_bezier_track_set_key_handle_mode", animation.ptr(), track, key, prev);
+						update_obj = true;
+					}
+				} break;
+				case Animation::TYPE_AUDIO: {
+					if (name == "stream") {
+						Ref<AudioStream> stream = p_value;
 
-						undo_redo->add_do_method(animation.ptr(), "track_set_key_value", track, key, d_new);
-						undo_redo->add_undo_method(animation.ptr(), "track_set_key_value", track, key, d_old);
+						if (!setting) {
+							setting = true;
+							undo_redo->create_action(TTR("Animation Multi Change Keyframe Value"), UndoRedo::MERGE_ENDS);
+						}
+						Ref<Resource> prev = animation->audio_track_get_key_stream(track, key);
+						undo_redo->add_do_method(animation.ptr(), "audio_track_set_key_stream", track, key, stream);
+						undo_redo->add_undo_method(animation.ptr(), "audio_track_set_key_stream", track, key, prev);
 						update_obj = true;
-					} break;
-					case Animation::TYPE_BEZIER: {
-						if (name == "value") {
-							const Variant &value = p_value;
+					} else if (name == "start_offset") {
+						float value = p_value;
 
-							if (!setting) {
-								setting = true;
-								undo_redo->create_action(TTR("Animation Multi Change Keyframe Value"), UndoRedo::MERGE_ENDS);
-							}
-							float prev = animation->bezier_track_get_key_value(track, key);
-							undo_redo->add_do_method(animation.ptr(), "bezier_track_set_key_value", track, key, value);
-							undo_redo->add_undo_method(animation.ptr(), "bezier_track_set_key_value", track, key, prev);
-							update_obj = true;
-						} else if (name == "in_handle") {
-							const Variant &value = p_value;
-
-							if (!setting) {
-								setting = true;
-								undo_redo->create_action(TTR("Animation Multi Change Keyframe Value"), UndoRedo::MERGE_ENDS);
-							}
-							Vector2 prev = animation->bezier_track_get_key_in_handle(track, key);
-							undo_redo->add_do_method(this, "_bezier_track_set_key_in_handle", track, key, value);
-							undo_redo->add_undo_method(this, "_bezier_track_set_key_in_handle", track, key, prev);
-							update_obj = true;
-						} else if (name == "out_handle") {
-							const Variant &value = p_value;
-
-							if (!setting) {
-								setting = true;
-								undo_redo->create_action(TTR("Animation Multi Change Keyframe Value"), UndoRedo::MERGE_ENDS);
-							}
-							Vector2 prev = animation->bezier_track_get_key_out_handle(track, key);
-							undo_redo->add_do_method(this, "_bezier_track_set_key_out_handle", track, key, value);
-							undo_redo->add_undo_method(this, "_bezier_track_set_key_out_handle", track, key, prev);
-							update_obj = true;
-						} else if (name == "handle_mode") {
-							const Variant &value = p_value;
-
-							if (!setting) {
-								setting = true;
-								undo_redo->create_action(TTR("Animation Multi Change Keyframe Value"), UndoRedo::MERGE_ENDS);
-							}
-							int prev = animation->bezier_track_get_key_handle_mode(track, key);
-							undo_redo->add_do_method(this, "_bezier_track_set_key_handle_mode", animation.ptr(), track, key, value);
-							undo_redo->add_undo_method(this, "_bezier_track_set_key_handle_mode", animation.ptr(), track, key, prev);
-							update_obj = true;
+						if (!setting) {
+							setting = true;
+							undo_redo->create_action(TTR("Animation Multi Change Keyframe Value"), UndoRedo::MERGE_ENDS);
 						}
-					} break;
-					case Animation::TYPE_AUDIO: {
-						if (name == "stream") {
-							Ref<AudioStream> stream = p_value;
+						float prev = animation->audio_track_get_key_start_offset(track, key);
+						undo_redo->add_do_method(animation.ptr(), "audio_track_set_key_start_offset", track, key, value);
+						undo_redo->add_undo_method(animation.ptr(), "audio_track_set_key_start_offset", track, key, prev);
+						update_obj = true;
+					} else if (name == "end_offset") {
+						float value = p_value;
 
-							if (!setting) {
-								setting = true;
-								undo_redo->create_action(TTR("Animation Multi Change Keyframe Value"), UndoRedo::MERGE_ENDS);
-							}
-							Ref<Resource> prev = animation->audio_track_get_key_stream(track, key);
-							undo_redo->add_do_method(animation.ptr(), "audio_track_set_key_stream", track, key, stream);
-							undo_redo->add_undo_method(animation.ptr(), "audio_track_set_key_stream", track, key, prev);
-							update_obj = true;
-						} else if (name == "start_offset") {
-							float value = p_value;
-
-							if (!setting) {
-								setting = true;
-								undo_redo->create_action(TTR("Animation Multi Change Keyframe Value"), UndoRedo::MERGE_ENDS);
-							}
-							float prev = animation->audio_track_get_key_start_offset(track, key);
-							undo_redo->add_do_method(animation.ptr(), "audio_track_set_key_start_offset", track, key, value);
-							undo_redo->add_undo_method(animation.ptr(), "audio_track_set_key_start_offset", track, key, prev);
-							update_obj = true;
-						} else if (name == "end_offset") {
-							float value = p_value;
-
-							if (!setting) {
-								setting = true;
-								undo_redo->create_action(TTR("Animation Multi Change Keyframe Value"), UndoRedo::MERGE_ENDS);
-							}
-							float prev = animation->audio_track_get_key_end_offset(track, key);
-							undo_redo->add_do_method(animation.ptr(), "audio_track_set_key_end_offset", track, key, value);
-							undo_redo->add_undo_method(animation.ptr(), "audio_track_set_key_end_offset", track, key, prev);
-							update_obj = true;
+						if (!setting) {
+							setting = true;
+							undo_redo->create_action(TTR("Animation Multi Change Keyframe Value"), UndoRedo::MERGE_ENDS);
 						}
-					} break;
-					case Animation::TYPE_ANIMATION: {
-						if (name == "animation") {
-							StringName anim_name = p_value;
+						float prev = animation->audio_track_get_key_end_offset(track, key);
+						undo_redo->add_do_method(animation.ptr(), "audio_track_set_key_end_offset", track, key, value);
+						undo_redo->add_undo_method(animation.ptr(), "audio_track_set_key_end_offset", track, key, prev);
+						update_obj = true;
+					}
+				} break;
+				case Animation::TYPE_ANIMATION: {
+					if (name == "animation") {
+						StringName anim_name = p_value;
 
-							if (!setting) {
-								setting = true;
-								undo_redo->create_action(TTR("Animation Multi Change Keyframe Value"), UndoRedo::MERGE_ENDS);
-							}
-							StringName prev = animation->animation_track_get_key_animation(track, key);
-							undo_redo->add_do_method(animation.ptr(), "animation_track_set_key_animation", track, key, anim_name);
-							undo_redo->add_undo_method(animation.ptr(), "animation_track_set_key_animation", track, key, prev);
-							update_obj = true;
+						if (!setting) {
+							setting = true;
+							undo_redo->create_action(TTR("Animation Multi Change Keyframe Value"), UndoRedo::MERGE_ENDS);
 						}
-					} break;
-				}
+						StringName prev = animation->animation_track_get_key_animation(track, key);
+						undo_redo->add_do_method(animation.ptr(), "animation_track_set_key_animation", track, key, anim_name);
+						undo_redo->add_undo_method(animation.ptr(), "animation_track_set_key_animation", track, key, prev);
+						update_obj = true;
+					}
+				} break;
 			}
 		}
+	}
 
-		Ref<EditorUndoRedoManager> &undo_redo = EditorNode::get_undo_redo();
-		if (setting) {
-			if (update_obj) {
-				undo_redo->add_do_method(this, "_update_obj", animation);
-				undo_redo->add_undo_method(this, "_update_obj", animation);
-			}
-
-			undo_redo->commit_action();
-			setting = false;
+	Ref<EditorUndoRedoManager> &undo_redo = EditorNode::get_undo_redo();
+	if (setting) {
+		if (update_obj) {
+			undo_redo->add_do_method(this, "_update_obj", animation);
+			undo_redo->add_undo_method(this, "_update_obj", animation);
+		}
 
-			if (change_notify_deserved) {
-				notify_change();
-			}
+		undo_redo->commit_action();
+		setting = false;
 
-			return true;
+		if (change_notify_deserved) {
+			notify_change();
 		}
 
-		return false;
+		return true;
 	}
 
-	bool _get(const StringName &p_name, Variant &r_ret) const {
-		for (const KeyValue<int, List<float>> &E : key_ofs_map) {
-			int track = E.key;
-			for (const float &key_ofs : E.value) {
-				int key = animation->track_find_key(track, key_ofs, true);
-				ERR_CONTINUE(key == -1);
+	return false;
+}
 
-				String name = p_name;
-				if (name == "time") {
-					r_ret = key_ofs;
-					return true;
-				}
+bool AnimationMultiTrackKeyEdit::_get(const StringName &p_name, Variant &r_ret) const {
+	for (const KeyValue<int, List<float>> &E : key_ofs_map) {
+		int track = E.key;
+		for (const float &key_ofs : E.value) {
+			int key = animation->track_find_key(track, key_ofs, Animation::FIND_MODE_APPROX);
+			ERR_CONTINUE(key == -1);
 
-				if (name == "frame") {
-					float fps = animation->get_step();
-					if (fps > 0) {
-						fps = 1.0 / fps;
+			String name = p_name;
+			if (name == "easing") {
+				r_ret = animation->track_get_key_transition(track, key);
+				return true;
+			}
+
+			switch (animation->track_get_type(track)) {
+				case Animation::TYPE_POSITION_3D:
+				case Animation::TYPE_ROTATION_3D:
+				case Animation::TYPE_SCALE_3D: {
+					if (name == "position" || name == "rotation" || name == "scale") {
+						r_ret = animation->track_get_key_value(track, key);
+						return true;
 					}
-					r_ret = key_ofs * fps;
-					return true;
-				}
 
-				if (name == "easing") {
-					r_ret = animation->track_get_key_transition(track, key);
-					return true;
-				}
+				} break;
+				case Animation::TYPE_BLEND_SHAPE:
+				case Animation::TYPE_VALUE: {
+					if (name == "value") {
+						r_ret = animation->track_get_key_value(track, key);
+						return true;
+					}
 
-				switch (animation->track_get_type(track)) {
-					case Animation::TYPE_POSITION_3D:
-					case Animation::TYPE_ROTATION_3D:
-					case Animation::TYPE_SCALE_3D: {
-						if (name == "position" || name == "rotation" || name == "scale") {
-							r_ret = animation->track_get_key_value(track, key);
-							return true;
-						}
+				} break;
+				case Animation::TYPE_METHOD: {
+					Dictionary d = animation->track_get_key_value(track, key);
 
-					} break;
-					case Animation::TYPE_BLEND_SHAPE:
-					case Animation::TYPE_VALUE: {
-						if (name == "value") {
-							r_ret = animation->track_get_key_value(track, key);
-							return true;
-						}
+					if (name == "name") {
+						ERR_FAIL_COND_V(!d.has("method"), false);
+						r_ret = d["method"];
+						return true;
+					}
 
-					} break;
-					case Animation::TYPE_METHOD: {
-						Dictionary d = animation->track_get_key_value(track, key);
+					ERR_FAIL_COND_V(!d.has("args"), false);
 
-						if (name == "name") {
-							ERR_FAIL_COND_V(!d.has("method"), false);
-							r_ret = d["method"];
-							return true;
-						}
+					Vector<Variant> args = d["args"];
 
-						ERR_FAIL_COND_V(!d.has("args"), false);
+					if (name == "arg_count") {
+						r_ret = args.size();
+						return true;
+					}
 
-						Vector<Variant> args = d["args"];
+					if (name.begins_with("args/")) {
+						int idx = name.get_slice("/", 1).to_int();
+						ERR_FAIL_INDEX_V(idx, args.size(), false);
 
-						if (name == "arg_count") {
-							r_ret = args.size();
+						String what = name.get_slice("/", 2);
+						if (what == "type") {
+							r_ret = args[idx].get_type();
 							return true;
 						}
 
-						if (name.begins_with("args/")) {
-							int idx = name.get_slice("/", 1).to_int();
-							ERR_FAIL_INDEX_V(idx, args.size(), false);
-
-							String what = name.get_slice("/", 2);
-							if (what == "type") {
-								r_ret = args[idx].get_type();
-								return true;
-							}
-
-							if (what == "value") {
-								r_ret = args[idx];
-								return true;
-							}
-						}
-
-					} break;
-					case Animation::TYPE_BEZIER: {
-						if (name == "value") {
-							r_ret = animation->bezier_track_get_key_value(track, key);
+						if (what == "value") {
+							r_ret = args[idx];
 							return true;
 						}
+					}
 
-						if (name == "in_handle") {
-							r_ret = animation->bezier_track_get_key_in_handle(track, key);
-							return true;
-						}
+				} break;
+				case Animation::TYPE_BEZIER: {
+					if (name == "value") {
+						r_ret = animation->bezier_track_get_key_value(track, key);
+						return true;
+					}
 
-						if (name == "out_handle") {
-							r_ret = animation->bezier_track_get_key_out_handle(track, key);
-							return true;
-						}
+					if (name == "in_handle") {
+						r_ret = animation->bezier_track_get_key_in_handle(track, key);
+						return true;
+					}
 
-						if (name == "handle_mode") {
-							r_ret = animation->bezier_track_get_key_handle_mode(track, key);
-							return true;
-						}
+					if (name == "out_handle") {
+						r_ret = animation->bezier_track_get_key_out_handle(track, key);
+						return true;
+					}
 
-					} break;
-					case Animation::TYPE_AUDIO: {
-						if (name == "stream") {
-							r_ret = animation->audio_track_get_key_stream(track, key);
-							return true;
-						}
+					if (name == "handle_mode") {
+						r_ret = animation->bezier_track_get_key_handle_mode(track, key);
+						return true;
+					}
 
-						if (name == "start_offset") {
-							r_ret = animation->audio_track_get_key_start_offset(track, key);
-							return true;
-						}
+				} break;
+				case Animation::TYPE_AUDIO: {
+					if (name == "stream") {
+						r_ret = animation->audio_track_get_key_stream(track, key);
+						return true;
+					}
 
-						if (name == "end_offset") {
-							r_ret = animation->audio_track_get_key_end_offset(track, key);
-							return true;
-						}
+					if (name == "start_offset") {
+						r_ret = animation->audio_track_get_key_start_offset(track, key);
+						return true;
+					}
 
-					} break;
-					case Animation::TYPE_ANIMATION: {
-						if (name == "animation") {
-							r_ret = animation->animation_track_get_key_animation(track, key);
-							return true;
-						}
+					if (name == "end_offset") {
+						r_ret = animation->audio_track_get_key_end_offset(track, key);
+						return true;
+					}
 
-					} break;
-				}
+				} break;
+				case Animation::TYPE_ANIMATION: {
+					if (name == "animation") {
+						r_ret = animation->animation_track_get_key_animation(track, key);
+						return true;
+					}
+
+				} break;
 			}
 		}
+	}
 
-		return false;
+	return false;
+}
+
+void AnimationMultiTrackKeyEdit::_get_property_list(List<PropertyInfo> *p_list) const {
+	if (animation.is_null()) {
+		return;
 	}
-	void _get_property_list(List<PropertyInfo> *p_list) const {
-		if (animation.is_null()) {
-			return;
-		}
 
-		int first_track = -1;
-		float first_key = -1.0;
+	int first_track = -1;
+	float first_key = -1.0;
 
-		bool show_time = true;
-		bool same_track_type = true;
-		bool same_key_type = true;
-		for (const KeyValue<int, List<float>> &E : key_ofs_map) {
-			int track = E.key;
-			ERR_FAIL_INDEX(track, animation->get_track_count());
+	bool same_track_type = true;
+	bool same_key_type = true;
+	for (const KeyValue<int, List<float>> &E : key_ofs_map) {
+		int track = E.key;
+		ERR_FAIL_INDEX(track, animation->get_track_count());
 
-			if (first_track < 0) {
-				first_track = track;
-			}
+		if (first_track < 0) {
+			first_track = track;
+		}
 
-			if (show_time && E.value.size() > 1) {
-				show_time = false;
+		if (same_track_type) {
+			if (animation->track_get_type(first_track) != animation->track_get_type(track)) {
+				same_track_type = false;
+				same_key_type = false;
 			}
 
-			if (same_track_type) {
-				if (animation->track_get_type(first_track) != animation->track_get_type(track)) {
-					same_track_type = false;
-					same_key_type = false;
+			for (const float &F : E.value) {
+				int key = animation->track_find_key(track, F, Animation::FIND_MODE_APPROX);
+				ERR_FAIL_COND(key == -1);
+				if (first_key < 0) {
+					first_key = key;
 				}
 
-				for (const float &F : E.value) {
-					int key = animation->track_find_key(track, F, true);
-					ERR_FAIL_COND(key == -1);
-					if (first_key < 0) {
-						first_key = key;
-					}
-
-					if (animation->track_get_key_value(first_track, first_key).get_type() != animation->track_get_key_value(track, key).get_type()) {
-						same_key_type = false;
-					}
+				if (animation->track_get_key_value(first_track, first_key).get_type() != animation->track_get_key_value(track, key).get_type()) {
+					same_key_type = false;
 				}
 			}
 		}
+	}
 
-		if (show_time) {
-			if (use_fps && animation->get_step() > 0) {
-				float max_frame = animation->get_length() / animation->get_step();
-				p_list->push_back(PropertyInfo(Variant::FLOAT, "frame", PROPERTY_HINT_RANGE, "0," + rtos(max_frame) + ",1"));
-			} else {
-				p_list->push_back(PropertyInfo(Variant::FLOAT, "time", PROPERTY_HINT_RANGE, "0," + rtos(animation->get_length()) + ",0.01"));
-			}
-		}
-
-		if (same_track_type) {
-			switch (animation->track_get_type(first_track)) {
-				case Animation::TYPE_POSITION_3D: {
-					p_list->push_back(PropertyInfo(Variant::VECTOR3, "position"));
-				} break;
-				case Animation::TYPE_ROTATION_3D: {
-					p_list->push_back(PropertyInfo(Variant::QUATERNION, "scale"));
-				} break;
-				case Animation::TYPE_SCALE_3D: {
-					p_list->push_back(PropertyInfo(Variant::VECTOR3, "scale"));
-				} break;
-				case Animation::TYPE_BLEND_SHAPE: {
-					p_list->push_back(PropertyInfo(Variant::FLOAT, "value"));
-				} break;
-				case Animation::TYPE_VALUE: {
-					if (same_key_type) {
-						Variant v = animation->track_get_key_value(first_track, first_key);
+	if (same_track_type) {
+		switch (animation->track_get_type(first_track)) {
+			case Animation::TYPE_POSITION_3D: {
+				p_list->push_back(PropertyInfo(Variant::VECTOR3, "position"));
+			} break;
+			case Animation::TYPE_ROTATION_3D: {
+				p_list->push_back(PropertyInfo(Variant::QUATERNION, "scale"));
+			} break;
+			case Animation::TYPE_SCALE_3D: {
+				p_list->push_back(PropertyInfo(Variant::VECTOR3, "scale"));
+			} break;
+			case Animation::TYPE_BLEND_SHAPE: {
+				p_list->push_back(PropertyInfo(Variant::FLOAT, "value"));
+			} break;
+			case Animation::TYPE_VALUE: {
+				if (same_key_type) {
+					Variant v = animation->track_get_key_value(first_track, first_key);
 
-						if (hint.type != Variant::NIL) {
-							PropertyInfo pi = hint;
-							pi.name = "value";
-							p_list->push_back(pi);
-						} else {
-							PropertyHint val_hint = PROPERTY_HINT_NONE;
-							String val_hint_string;
-
-							if (v.get_type() == Variant::OBJECT) {
-								// Could actually check the object property if exists..? Yes I will!
-								Ref<Resource> res = v;
-								if (res.is_valid()) {
-									val_hint = PROPERTY_HINT_RESOURCE_TYPE;
-									val_hint_string = res->get_class();
-								}
+					if (hint.type != Variant::NIL) {
+						PropertyInfo pi = hint;
+						pi.name = "value";
+						p_list->push_back(pi);
+					} else {
+						PropertyHint val_hint = PROPERTY_HINT_NONE;
+						String val_hint_string;
+
+						if (v.get_type() == Variant::OBJECT) {
+							// Could actually check the object property if exists..? Yes I will!
+							Ref<Resource> res = v;
+							if (res.is_valid()) {
+								val_hint = PROPERTY_HINT_RESOURCE_TYPE;
+								val_hint_string = res->get_class();
 							}
+						}
 
-							if (v.get_type() != Variant::NIL) {
-								p_list->push_back(PropertyInfo(v.get_type(), "value", val_hint, val_hint_string));
-							}
+						if (v.get_type() != Variant::NIL) {
+							p_list->push_back(PropertyInfo(v.get_type(), "value", val_hint, val_hint_string));
 						}
 					}
+				}
 
-					p_list->push_back(PropertyInfo(Variant::FLOAT, "easing", PROPERTY_HINT_EXP_EASING));
-				} break;
-				case Animation::TYPE_METHOD: {
-					p_list->push_back(PropertyInfo(Variant::STRING_NAME, "name"));
+				p_list->push_back(PropertyInfo(Variant::FLOAT, "easing", PROPERTY_HINT_EXP_EASING));
+			} break;
+			case Animation::TYPE_METHOD: {
+				p_list->push_back(PropertyInfo(Variant::STRING_NAME, "name"));
 
-					p_list->push_back(PropertyInfo(Variant::INT, "arg_count", PROPERTY_HINT_RANGE, "0,32,1,or_greater"));
+				p_list->push_back(PropertyInfo(Variant::INT, "arg_count", PROPERTY_HINT_RANGE, "0,32,1,or_greater"));
 
-					Dictionary d = animation->track_get_key_value(first_track, first_key);
-					ERR_FAIL_COND(!d.has("args"));
-					Vector<Variant> args = d["args"];
-					String vtypes;
-					for (int i = 0; i < Variant::VARIANT_MAX; i++) {
-						if (i > 0) {
-							vtypes += ",";
-						}
-						vtypes += Variant::get_type_name(Variant::Type(i));
+				Dictionary d = animation->track_get_key_value(first_track, first_key);
+				ERR_FAIL_COND(!d.has("args"));
+				Vector<Variant> args = d["args"];
+				String vtypes;
+				for (int i = 0; i < Variant::VARIANT_MAX; i++) {
+					if (i > 0) {
+						vtypes += ",";
 					}
+					vtypes += Variant::get_type_name(Variant::Type(i));
+				}
 
-					for (int i = 0; i < args.size(); i++) {
-						p_list->push_back(PropertyInfo(Variant::INT, "args/" + itos(i) + "/type", PROPERTY_HINT_ENUM, vtypes));
-						if (args[i].get_type() != Variant::NIL) {
-							p_list->push_back(PropertyInfo(args[i].get_type(), "args/" + itos(i) + "/value"));
-						}
-					}
-				} break;
-				case Animation::TYPE_BEZIER: {
-					p_list->push_back(PropertyInfo(Variant::FLOAT, "value"));
-					p_list->push_back(PropertyInfo(Variant::VECTOR2, "in_handle"));
-					p_list->push_back(PropertyInfo(Variant::VECTOR2, "out_handle"));
-					p_list->push_back(PropertyInfo(Variant::INT, "handle_mode", PROPERTY_HINT_ENUM, "Free,Linear,Balanced,Mirrored"));
-				} break;
-				case Animation::TYPE_AUDIO: {
-					p_list->push_back(PropertyInfo(Variant::OBJECT, "stream", PROPERTY_HINT_RESOURCE_TYPE, "AudioStream"));
-					p_list->push_back(PropertyInfo(Variant::FLOAT, "start_offset", PROPERTY_HINT_RANGE, "0,3600,0.01,or_greater"));
-					p_list->push_back(PropertyInfo(Variant::FLOAT, "end_offset", PROPERTY_HINT_RANGE, "0,3600,0.01,or_greater"));
-				} break;
-				case Animation::TYPE_ANIMATION: {
-					if (key_ofs_map.size() > 1) {
-						break;
+				for (int i = 0; i < args.size(); i++) {
+					p_list->push_back(PropertyInfo(Variant::INT, "args/" + itos(i) + "/type", PROPERTY_HINT_ENUM, vtypes));
+					if (args[i].get_type() != Variant::NIL) {
+						p_list->push_back(PropertyInfo(args[i].get_type(), "args/" + itos(i) + "/value"));
 					}
+				}
+			} break;
+			case Animation::TYPE_BEZIER: {
+				p_list->push_back(PropertyInfo(Variant::FLOAT, "value"));
+				p_list->push_back(PropertyInfo(Variant::VECTOR2, "in_handle"));
+				p_list->push_back(PropertyInfo(Variant::VECTOR2, "out_handle"));
+				p_list->push_back(PropertyInfo(Variant::INT, "handle_mode", PROPERTY_HINT_ENUM, "Free,Linear,Balanced,Mirrored"));
+			} break;
+			case Animation::TYPE_AUDIO: {
+				p_list->push_back(PropertyInfo(Variant::OBJECT, "stream", PROPERTY_HINT_RESOURCE_TYPE, "AudioStream"));
+				p_list->push_back(PropertyInfo(Variant::FLOAT, "start_offset", PROPERTY_HINT_RANGE, "0,3600,0.0001,or_greater"));
+				p_list->push_back(PropertyInfo(Variant::FLOAT, "end_offset", PROPERTY_HINT_RANGE, "0,3600,0.0001,or_greater"));
+			} break;
+			case Animation::TYPE_ANIMATION: {
+				if (key_ofs_map.size() > 1) {
+					break;
+				}
 
-					String animations;
-
-					if (root_path && root_path->has_node(animation->track_get_path(first_track))) {
-						AnimationPlayer *ap = Object::cast_to<AnimationPlayer>(root_path->get_node(animation->track_get_path(first_track)));
-						if (ap) {
-							List<StringName> anims;
-							ap->get_animation_list(&anims);
-							for (List<StringName>::Element *G = anims.front(); G; G = G->next()) {
-								if (!animations.is_empty()) {
-									animations += ",";
-								}
+				String animations;
 
-								animations += String(G->get());
+				if (root_path && root_path->has_node(animation->track_get_path(first_track))) {
+					AnimationPlayer *ap = Object::cast_to<AnimationPlayer>(root_path->get_node(animation->track_get_path(first_track)));
+					if (ap) {
+						List<StringName> anims;
+						ap->get_animation_list(&anims);
+						for (List<StringName>::Element *G = anims.front(); G; G = G->next()) {
+							if (!animations.is_empty()) {
+								animations += ",";
 							}
+
+							animations += String(G->get());
 						}
 					}
+				}
 
-					if (!animations.is_empty()) {
-						animations += ",";
-					}
-					animations += "[stop]";
+				if (!animations.is_empty()) {
+					animations += ",";
+				}
+				animations += "[stop]";
 
-					p_list->push_back(PropertyInfo(Variant::STRING_NAME, "animation", PROPERTY_HINT_ENUM, animations));
-				} break;
-			}
+				p_list->push_back(PropertyInfo(Variant::STRING_NAME, "animation", PROPERTY_HINT_ENUM, animations));
+			} break;
 		}
 	}
+}
 
-	Ref<Animation> animation;
-
-	RBMap<int, List<float>> key_ofs_map;
-	RBMap<int, NodePath> base_map;
-	PropertyInfo hint;
-
-	Node *root_path = nullptr;
-
-	bool use_fps = false;
-
-	void notify_change() {
-		notify_property_list_changed();
-	}
+void AnimationMultiTrackKeyEdit::notify_change() {
+	notify_property_list_changed();
+}
 
-	Node *get_root_path() {
-		return root_path;
-	}
+Node *AnimationMultiTrackKeyEdit::get_root_path() {
+	return root_path;
+}
 
-	void set_use_fps(bool p_enable) {
-		use_fps = p_enable;
-		notify_property_list_changed();
-	}
-};
+void AnimationMultiTrackKeyEdit::set_use_fps(bool p_enable) {
+	use_fps = p_enable;
+	notify_property_list_changed();
+}
 
 void AnimationTimelineEdit::_zoom_changed(double) {
 	queue_redraw();
@@ -1420,7 +1246,7 @@ void AnimationTimelineEdit::_anim_length_changed(double p_new_len) {
 		return;
 	}
 
-	p_new_len = MAX(0.001, p_new_len);
+	p_new_len = MAX(0.0001, p_new_len);
 	if (use_fps && animation->get_step() > 0) {
 		p_new_len *= animation->get_step();
 	}
@@ -1539,7 +1365,7 @@ void AnimationTimelineEdit::_notification(int p_what) {
 
 			float l = animation->get_length();
 			if (l <= 0) {
-				l = 0.001; // Avoid crashor.
+				l = 0.0001; // Avoid crashor.
 			}
 
 			Ref<Texture2D> hsize_icon = get_theme_icon(SNAME("Hsize"), SNAME("EditorIcons"));
@@ -1600,7 +1426,7 @@ void AnimationTimelineEdit::_notification(int p_what) {
 						end_px = zoomw;
 					}
 
-					draw_rect(Rect2(Point2(get_name_limit() + begin_px, 0), Point2(end_px - begin_px - 1, h)), timecolor);
+					draw_rect(Rect2(Point2(get_name_limit() + begin_px, 0), Point2(end_px - begin_px, h)), timecolor);
 				}
 			}
 
@@ -1759,7 +1585,7 @@ void AnimationTimelineEdit::update_values() {
 		}
 	} else {
 		length->set_value(animation->get_length());
-		length->set_step(0.001);
+		length->set_step(0.0001);
 		length->set_tooltip_text(TTR("Animation length (seconds)"));
 		time_icon->set_tooltip_text(TTR("Animation length (seconds)"));
 	}
@@ -1950,9 +1776,9 @@ AnimationTimelineEdit::AnimationTimelineEdit() {
 	time_icon->set_tooltip_text(TTR("Animation length (seconds)"));
 	len_hb->add_child(time_icon);
 	length = memnew(EditorSpinSlider);
-	length->set_min(0.001);
+	length->set_min(0.0001);
 	length->set_max(36000);
-	length->set_step(0.001);
+	length->set_step(0.0001);
 	length->set_allow_greater(true);
 	length->set_custom_minimum_size(Vector2(70 * EDSCALE, 0));
 	length->set_hide_slider(true);
@@ -2058,7 +1884,7 @@ void AnimationTrackEdit::_notification(int p_what) {
 					} else if (animation->track_get_type(track) == Animation::TYPE_AUDIO) {
 						text = TTR("Audio Clips:");
 					} else if (animation->track_get_type(track) == Animation::TYPE_ANIMATION) {
-						text = TTR("Anim Clips:");
+						text = TTR("Animation Clips:");
 					} else {
 						text += anim_path.get_concatenated_subnames();
 					}
@@ -2670,7 +2496,7 @@ String AnimationTrackEdit::get_tooltip(const Point2 &p_pos) const {
 		}
 
 		if (key_idx != -1) {
-			String text = TTR("Time (s):") + " " + rtos(animation->track_get_key_time(track, key_idx)) + "\n";
+			String text = TTR("Time (s):") + " " + TS->format_number(rtos(Math::snapped(animation->track_get_key_time(track, key_idx), 0.0001))) + "\n";
 			switch (animation->track_get_type(track)) {
 				case Animation::TYPE_POSITION_3D: {
 					Vector3 t = animation->track_get_key_value(track, key_idx);
@@ -4390,7 +4216,7 @@ AnimationTrackEditor::TrackIndices AnimationTrackEditor::_confirm_insert(InsertD
 		p_next_tracks.normal++;
 	} else {
 		undo_redo->add_undo_method(animation.ptr(), "track_remove_key_at_time", p_id.track_idx, time);
-		int existing = animation->track_find_key(p_id.track_idx, time, true);
+		int existing = animation->track_find_key(p_id.track_idx, time, Animation::FIND_MODE_APPROX);
 		if (existing != -1) {
 			Variant v = animation->track_get_key_value(p_id.track_idx, existing);
 			float trans = animation->track_get_key_transition(p_id.track_idx, existing);
@@ -5005,8 +4831,8 @@ void AnimationTrackEditor::_insert_key_from_track(float p_ofs, int p_track) {
 	if (snap->is_pressed() && step->get_value() != 0) {
 		p_ofs = snap_time(p_ofs);
 	}
-	while (animation->track_find_key(p_track, p_ofs, true) != -1) { // Make sure insertion point is valid.
-		p_ofs += 0.001;
+	while (animation->track_find_key(p_track, p_ofs, Animation::FIND_MODE_APPROX) != -1) { // Make sure insertion point is valid.
+		p_ofs += 0.0001;
 	}
 
 	Ref<EditorUndoRedoManager> &undo_redo = EditorNode::get_undo_redo();
@@ -5338,7 +5164,7 @@ void AnimationTrackEditor::_select_at_anim(const Ref<Animation> &p_anim, int p_t
 		return;
 	}
 
-	int idx = animation->track_find_key(p_track, p_pos, true);
+	int idx = animation->track_find_key(p_track, p_pos, Animation::FIND_MODE_APPROX);
 	ERR_FAIL_COND(idx < 0);
 
 	SelectedKey sk;
@@ -5365,7 +5191,7 @@ void AnimationTrackEditor::_move_selection_commit() {
 	// 2 - Remove overlapped keys.
 	for (RBMap<SelectedKey, KeyInfo>::Element *E = selection.back(); E; E = E->prev()) {
 		float newtime = snap_time(E->get().pos + motion);
-		int idx = animation->track_find_key(E->key().track, newtime, true);
+		int idx = animation->track_find_key(E->key().track, newtime, Animation::FIND_MODE_APPROX);
 		if (idx == -1) {
 			continue;
 		}
@@ -5625,7 +5451,7 @@ void AnimationTrackEditor::_anim_duplicate_keys(bool transpose) {
 				continue;
 			}
 
-			int existing_idx = animation->track_find_key(dst_track, dst_time, true);
+			int existing_idx = animation->track_find_key(dst_track, dst_time, Animation::FIND_MODE_APPROX);
 
 			undo_redo->add_do_method(animation.ptr(), "track_insert_key", dst_track, dst_time, animation->track_get_key_value(E->key().track, E->key().key), animation->track_get_key_transition(E->key().track, E->key().key));
 			undo_redo->add_undo_method(animation.ptr(), "track_remove_key_at_time", dst_track, dst_time);
@@ -5916,7 +5742,7 @@ void AnimationTrackEditor::_edit_menu_pressed(int p_option) {
 			// 2 - Remove overlapped keys.
 			for (RBMap<SelectedKey, KeyInfo>::Element *E = selection.back(); E; E = E->prev()) {
 				float newtime = (E->get().pos - from_t) * s + from_t;
-				int idx = animation->track_find_key(E->key().track, newtime, true);
+				int idx = animation->track_find_key(E->key().track, newtime, Animation::FIND_MODE_APPROX);
 				if (idx == -1) {
 					continue;
 				}
@@ -6127,7 +5953,7 @@ void AnimationTrackEditor::_edit_menu_pressed(int p_option) {
 					undo_redo->add_do_method(reset.ptr(), "track_set_path", dst_track, path);
 					undo_redo->add_undo_method(reset.ptr(), "remove_track", dst_track);
 				} else {
-					existing_idx = reset->track_find_key(dst_track, 0, true);
+					existing_idx = reset->track_find_key(dst_track, 0, Animation::FIND_MODE_APPROX);
 				}
 
 				undo_redo->add_do_method(reset.ptr(), "track_insert_key", dst_track, 0, animation->track_get_key_value(sk.track, sk.key), animation->track_get_key_transition(sk.track, sk.key));
@@ -6656,7 +6482,7 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	step = memnew(EditorSpinSlider);
 	step->set_min(0);
 	step->set_max(1000000);
-	step->set_step(0.001);
+	step->set_step(0.0001);
 	step->set_hide_slider(true);
 	step->set_custom_minimum_size(Size2(100, 0) * EDSCALE);
 	step->set_tooltip_text(TTR("Animation step value."));
@@ -6946,3 +6772,103 @@ AnimationTrackEditor::~AnimationTrackEditor() {
 		memdelete(multi_key_edit);
 	}
 }
+
+// AnimationTrackKeyEditEditorPlugin
+
+void AnimationTrackKeyEditEditor::_time_edit_entered() {
+	int key = animation->track_find_key(track, key_ofs, Animation::FIND_MODE_APPROX);
+	if (key == -1) {
+		return;
+	}
+	key_data_cache.time = animation->track_get_key_time(track, key);
+	key_data_cache.transition = animation->track_get_key_transition(track, key);
+	key_data_cache.value = animation->track_get_key_value(track, key);
+}
+
+void AnimationTrackKeyEditEditor::_time_edit_exited() {
+	real_t new_time = spinner->get_value();
+
+	if (use_fps) {
+		real_t fps = animation->get_step();
+		if (fps > 0) {
+			fps = 1.0 / fps;
+		}
+		new_time /= fps;
+	}
+
+	if (Math::is_equal_approx(new_time, key_data_cache.time)) {
+		return; // No change.
+	}
+
+	int existing = animation->track_find_key(track, new_time, Animation::FIND_MODE_APPROX);
+	Ref<EditorUndoRedoManager> &undo_redo = EditorNode::get_undo_redo();
+	undo_redo->create_action(TTR("Animation Change Keyframe Time"), UndoRedo::MERGE_ENDS);
+
+	if (existing != -1) {
+		undo_redo->add_do_method(animation.ptr(), "track_remove_key_at_time", track, animation->track_get_key_time(track, existing));
+	}
+	undo_redo->add_do_method(animation.ptr(), "track_remove_key_at_time", track, key_data_cache.time);
+	undo_redo->add_do_method(animation.ptr(), "track_insert_key", track, new_time, key_data_cache.value, key_data_cache.transition);
+	undo_redo->add_undo_method(animation.ptr(), "track_remove_key_at_time", track, new_time);
+	undo_redo->add_undo_method(animation.ptr(), "track_insert_key", track, key_data_cache.time, key_data_cache.value, key_data_cache.transition);
+	if (existing != -1) {
+		undo_redo->add_undo_method(animation.ptr(), "track_insert_key", track, animation->track_get_key_time(track, existing), animation->track_get_key_value(track, existing), animation->track_get_key_transition(track, existing));
+	}
+
+	// Reselect key.
+	AnimationPlayerEditor *ape = AnimationPlayerEditor::get_singleton();
+	if (ape) {
+		AnimationTrackEditor *ate = ape->get_track_editor();
+		if (ate) {
+			undo_redo->add_do_method(ate, "_clear_selection_for_anim", animation);
+			undo_redo->add_undo_method(ate, "_clear_selection_for_anim", animation);
+			undo_redo->add_do_method(ate, "_select_at_anim", animation, track, new_time);
+			undo_redo->add_undo_method(ate, "_select_at_anim", animation, track, key_data_cache.time);
+		}
+	}
+
+	undo_redo->commit_action();
+}
+
+AnimationTrackKeyEditEditor::AnimationTrackKeyEditEditor(Ref<Animation> p_animation, int p_track, real_t p_key_ofs, bool p_use_fps) {
+	if (!p_animation.is_valid()) {
+		return;
+	}
+
+	animation = p_animation;
+	track = p_track;
+	key_ofs = p_key_ofs;
+	use_fps = p_use_fps;
+
+	set_label("Time");
+
+	spinner = memnew(EditorSpinSlider);
+	spinner->set_focus_mode(Control::FOCUS_CLICK);
+	spinner->set_min(0);
+	spinner->set_allow_greater(true);
+	spinner->set_allow_lesser(true);
+
+	if (use_fps) {
+		spinner->set_step(1);
+		spinner->set_hide_slider(true);
+		real_t fps = animation->get_step();
+		if (fps > 0) {
+			fps = 1.0 / fps;
+		}
+		spinner->set_value(key_ofs * fps);
+	} else {
+		spinner->set_step(0.0001);
+		spinner->set_value(key_ofs);
+		spinner->set_max(animation->get_length());
+	}
+
+	add_child(spinner);
+
+	spinner->connect("grabbed", callable_mp(this, &AnimationTrackKeyEditEditor::_time_edit_entered), CONNECT_DEFERRED);
+	spinner->connect("ungrabbed", callable_mp(this, &AnimationTrackKeyEditEditor::_time_edit_exited), CONNECT_DEFERRED);
+	spinner->connect("value_focus_entered", callable_mp(this, &AnimationTrackKeyEditEditor::_time_edit_entered), CONNECT_DEFERRED);
+	spinner->connect("value_focus_exited", callable_mp(this, &AnimationTrackKeyEditEditor::_time_edit_exited), CONNECT_DEFERRED);
+}
+
+AnimationTrackKeyEditEditor::~AnimationTrackKeyEditEditor() {
+}
diff --git a/editor/animation_track_editor.h b/editor/animation_track_editor.h
index 4b50424f39..5ae826bd5c 100644
--- a/editor/animation_track_editor.h
+++ b/editor/animation_track_editor.h
@@ -50,9 +50,83 @@
 #include "scene/resources/animation.h"
 #include "scene_tree_editor.h"
 
+class AnimationTrackEditor;
 class AnimationTrackEdit;
 class ViewPanner;
 
+class AnimationTrackKeyEdit : public Object {
+	GDCLASS(AnimationTrackKeyEdit, Object);
+
+public:
+	bool setting = false;
+	bool animation_read_only = false;
+
+	Ref<Animation> animation;
+	int track = -1;
+	float key_ofs = 0;
+	Node *root_path = nullptr;
+
+	PropertyInfo hint;
+	NodePath base;
+	bool use_fps = false;
+
+	bool _hide_script_from_inspector() { return true; }
+	bool _hide_metadata_from_inspector() { return true; }
+	bool _dont_undo_redo() { return true; }
+
+	bool _is_read_only() { return animation_read_only; }
+
+	void notify_change();
+	Node *get_root_path();
+	void set_use_fps(bool p_enable);
+
+protected:
+	static void _bind_methods();
+	void _fix_node_path(Variant &value);
+	void _update_obj(const Ref<Animation> &p_anim);
+	void _key_ofs_changed(const Ref<Animation> &p_anim, float from, float to);
+	bool _set(const StringName &p_name, const Variant &p_value);
+	bool _get(const StringName &p_name, Variant &r_ret) const;
+	void _get_property_list(List<PropertyInfo> *p_list) const;
+};
+
+class AnimationMultiTrackKeyEdit : public Object {
+	GDCLASS(AnimationMultiTrackKeyEdit, Object);
+
+public:
+	bool setting = false;
+	bool animation_read_only = false;
+
+	Ref<Animation> animation;
+
+	RBMap<int, List<float>> key_ofs_map;
+	RBMap<int, NodePath> base_map;
+	PropertyInfo hint;
+
+	Node *root_path = nullptr;
+
+	bool use_fps = false;
+
+	bool _hide_script_from_inspector() { return true; }
+	bool _hide_metadata_from_inspector() { return true; }
+	bool _dont_undo_redo() { return true; }
+
+	bool _is_read_only() { return animation_read_only; }
+
+	void notify_change();
+	Node *get_root_path();
+	void set_use_fps(bool p_enable);
+
+protected:
+	static void _bind_methods();
+	void _fix_node_path(Variant &value, NodePath &base);
+	void _update_obj(const Ref<Animation> &p_anim);
+	void _key_ofs_changed(const Ref<Animation> &p_anim, float from, float to);
+	bool _set(const StringName &p_name, const Variant &p_value);
+	bool _get(const StringName &p_name, Variant &r_ret) const;
+	void _get_property_list(List<PropertyInfo> *p_list) const;
+};
+
 class AnimationTimelineEdit : public Range {
 	GDCLASS(AnimationTimelineEdit, Range);
 
@@ -129,8 +203,6 @@ public:
 	AnimationTimelineEdit();
 };
 
-class AnimationTrackEditor;
-
 class AnimationTrackEdit : public Control {
 	GDCLASS(AnimationTrackEdit, Control);
 	friend class AnimationTimelineEdit;
@@ -592,4 +664,30 @@ public:
 	~AnimationTrackEditor();
 };
 
+// AnimationTrackKeyEditEditorPlugin
+
+class AnimationTrackKeyEditEditor : public EditorProperty {
+	GDCLASS(AnimationTrackKeyEditEditor, EditorProperty);
+
+	Ref<Animation> animation;
+	int track = -1;
+	real_t key_ofs = 0.0;
+	bool use_fps = false;
+
+	EditorSpinSlider *spinner = nullptr;
+
+	struct KeyDataCache {
+		real_t time = 0.0;
+		float transition = 0.0;
+		Variant value;
+	} key_data_cache;
+
+	void _time_edit_entered();
+	void _time_edit_exited();
+
+public:
+	AnimationTrackKeyEditEditor(Ref<Animation> p_animation, int p_track, real_t p_key_ofs, bool p_use_fps);
+	~AnimationTrackKeyEditEditor();
+};
+
 #endif // ANIMATION_TRACK_EDITOR_H
diff --git a/editor/animation_track_editor_plugins.cpp b/editor/animation_track_editor_plugins.cpp
index 704935e163..0ad62710eb 100644
--- a/editor/animation_track_editor_plugins.cpp
+++ b/editor/animation_track_editor_plugins.cpp
@@ -831,8 +831,8 @@ Rect2 AnimationTrackEditTypeAudio::get_key_rect(int p_index, float p_pixels_sec)
 
 	len -= end_ofs;
 	len -= start_ofs;
-	if (len <= 0.001) {
-		len = 0.001;
+	if (len <= 0.0001) {
+		len = 0.0001;
 	}
 
 	if (get_animation()->track_get_key_count(get_track()) > p_index + 1) {
@@ -887,8 +887,8 @@ void AnimationTrackEditTypeAudio::draw_key(int p_index, float p_pixels_sec, int
 	len -= end_ofs;
 	len -= start_ofs;
 
-	if (len <= 0.001) {
-		len = 0.001;
+	if (len <= 0.0001) {
+		len = 0.0001;
 	}
 
 	int pixel_len = len * p_pixels_sec;
@@ -1014,8 +1014,8 @@ void AnimationTrackEditTypeAudio::drop_data(const Point2 &p_point, const Variant
 
 			ofs = get_editor()->snap_time(ofs);
 
-			while (get_animation()->track_find_key(get_track(), ofs, true) != -1) { //make sure insertion point is valid
-				ofs += 0.001;
+			while (get_animation()->track_find_key(get_track(), ofs, Animation::FIND_MODE_APPROX) != -1) { //make sure insertion point is valid
+				ofs += 0.0001;
 			}
 
 			Ref<EditorUndoRedoManager> &undo_redo = EditorNode::get_undo_redo();
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 0c75a36c7d..01e605880c 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -7262,6 +7262,7 @@ EditorNode::EditorNode() {
 	gui_base->add_child(disk_changed);
 
 	add_editor_plugin(memnew(AnimationPlayerEditorPlugin));
+	add_editor_plugin(memnew(AnimationTrackKeyEditEditorPlugin));
 	add_editor_plugin(memnew(CanvasItemEditorPlugin));
 	add_editor_plugin(memnew(Node3DEditorPlugin));
 	add_editor_plugin(memnew(ScriptEditorPlugin));
diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp
index fb3bf46c05..4c9b18efe7 100644
--- a/editor/editor_properties.cpp
+++ b/editor/editor_properties.cpp
@@ -1384,10 +1384,11 @@ void EditorPropertyInteger::update_property() {
 void EditorPropertyInteger::_bind_methods() {
 }
 
-void EditorPropertyInteger::setup(int64_t p_min, int64_t p_max, int64_t p_step, bool p_allow_greater, bool p_allow_lesser, const String &p_suffix) {
+void EditorPropertyInteger::setup(int64_t p_min, int64_t p_max, int64_t p_step, bool p_hide_slider, bool p_allow_greater, bool p_allow_lesser, const String &p_suffix) {
 	spin->set_min(p_min);
 	spin->set_max(p_max);
 	spin->set_step(p_step);
+	spin->set_hide_slider(p_hide_slider);
 	spin->set_allow_greater(p_allow_greater);
 	spin->set_allow_lesser(p_allow_lesser);
 	spin->set_suffix(p_suffix);
@@ -2242,12 +2243,11 @@ void EditorPropertyVector2i::_notification(int p_what) {
 	}
 }
 
-void EditorPropertyVector2i::setup(int p_min, int p_max, bool p_hide_slider, bool p_link, const String &p_suffix) {
+void EditorPropertyVector2i::setup(int p_min, int p_max, bool p_link, const String &p_suffix) {
 	for (int i = 0; i < 2; i++) {
 		spin[i]->set_min(p_min);
 		spin[i]->set_max(p_max);
 		spin[i]->set_step(1);
-		spin[i]->set_hide_slider(p_hide_slider);
 		spin[i]->set_allow_greater(true);
 		spin[i]->set_allow_lesser(true);
 		spin[i]->set_suffix(p_suffix);
@@ -2352,12 +2352,11 @@ void EditorPropertyRect2i::_notification(int p_what) {
 void EditorPropertyRect2i::_bind_methods() {
 }
 
-void EditorPropertyRect2i::setup(int p_min, int p_max, bool p_hide_slider, const String &p_suffix) {
+void EditorPropertyRect2i::setup(int p_min, int p_max, const String &p_suffix) {
 	for (int i = 0; i < 4; i++) {
 		spin[i]->set_min(p_min);
 		spin[i]->set_max(p_max);
 		spin[i]->set_step(1);
-		spin[i]->set_hide_slider(p_hide_slider);
 		spin[i]->set_allow_greater(true);
 		spin[i]->set_allow_lesser(true);
 		spin[i]->set_suffix(p_suffix);
@@ -2496,12 +2495,12 @@ void EditorPropertyVector3i::_notification(int p_what) {
 void EditorPropertyVector3i::_bind_methods() {
 }
 
-void EditorPropertyVector3i::setup(int p_min, int p_max, bool p_hide_slider, bool p_link, const String &p_suffix) {
+void EditorPropertyVector3i::setup(int p_min, int p_max, bool p_link, const String &p_suffix) {
 	for (int i = 0; i < 3; i++) {
 		spin[i]->set_min(p_min);
 		spin[i]->set_max(p_max);
 		spin[i]->set_step(1);
-		spin[i]->set_hide_slider(p_hide_slider);
+		spin[i]->set_hide_slider(false);
 		spin[i]->set_allow_greater(true);
 		spin[i]->set_allow_lesser(true);
 		spin[i]->set_suffix(p_suffix);
@@ -3004,11 +3003,11 @@ void EditorPropertyVector4i::_notification(int p_what) {
 void EditorPropertyVector4i::_bind_methods() {
 }
 
-void EditorPropertyVector4i::setup(double p_min, double p_max, bool p_hide_slider, const String &p_suffix) {
+void EditorPropertyVector4i::setup(double p_min, double p_max, const String &p_suffix) {
 	for (int i = 0; i < 4; i++) {
 		spin[i]->set_min(p_min);
 		spin[i]->set_max(p_max);
-		spin[i]->set_hide_slider(p_hide_slider);
+		spin[i]->set_step(1);
 		spin[i]->set_allow_greater(true);
 		spin[i]->set_allow_lesser(true);
 		spin[i]->set_suffix(p_suffix);
@@ -4347,7 +4346,7 @@ EditorProperty *EditorInspectorDefaultPlugin::get_editor_for_property(Object *p_
 				EditorPropertyInteger *editor = memnew(EditorPropertyInteger);
 
 				EditorPropertyRangeHint hint = _parse_range_hint(p_hint, p_hint_text, 1);
-				editor->setup(hint.min, hint.max, hint.step, hint.or_greater, hint.or_less, hint.suffix);
+				editor->setup(hint.min, hint.max, hint.step, hint.hide_slider, hint.or_greater, hint.or_less, hint.suffix);
 
 				return editor;
 			}
@@ -4475,7 +4474,7 @@ EditorProperty *EditorInspectorDefaultPlugin::get_editor_for_property(Object *p_
 		case Variant::VECTOR2I: {
 			EditorPropertyVector2i *editor = memnew(EditorPropertyVector2i(p_wide));
 			EditorPropertyRangeHint hint = _parse_range_hint(p_hint, p_hint_text, 1);
-			editor->setup(hint.min, hint.max, hint.hide_slider, p_hint == PROPERTY_HINT_LINK, hint.suffix);
+			editor->setup(hint.min, hint.max, p_hint == PROPERTY_HINT_LINK, hint.suffix);
 			return editor;
 
 		} break;
@@ -4488,7 +4487,7 @@ EditorProperty *EditorInspectorDefaultPlugin::get_editor_for_property(Object *p_
 		case Variant::RECT2I: {
 			EditorPropertyRect2i *editor = memnew(EditorPropertyRect2i(p_wide));
 			EditorPropertyRangeHint hint = _parse_range_hint(p_hint, p_hint_text, 1);
-			editor->setup(hint.min, hint.max, hint.hide_slider, hint.suffix);
+			editor->setup(hint.min, hint.max, hint.suffix);
 
 			return editor;
 		} break;
@@ -4502,7 +4501,7 @@ EditorProperty *EditorInspectorDefaultPlugin::get_editor_for_property(Object *p_
 		case Variant::VECTOR3I: {
 			EditorPropertyVector3i *editor = memnew(EditorPropertyVector3i(p_wide));
 			EditorPropertyRangeHint hint = _parse_range_hint(p_hint, p_hint_text, 1);
-			editor->setup(hint.min, hint.max, hint.hide_slider, p_hint == PROPERTY_HINT_LINK, hint.suffix);
+			editor->setup(hint.min, hint.max, p_hint == PROPERTY_HINT_LINK, hint.suffix);
 			return editor;
 
 		} break;
@@ -4516,7 +4515,7 @@ EditorProperty *EditorInspectorDefaultPlugin::get_editor_for_property(Object *p_
 		case Variant::VECTOR4I: {
 			EditorPropertyVector4i *editor = memnew(EditorPropertyVector4i);
 			EditorPropertyRangeHint hint = _parse_range_hint(p_hint, p_hint_text, 1);
-			editor->setup(hint.min, hint.max, hint.hide_slider, hint.suffix);
+			editor->setup(hint.min, hint.max, hint.suffix);
 			return editor;
 
 		} break;
diff --git a/editor/editor_properties.h b/editor/editor_properties.h
index f38e33d9e3..042b94130b 100644
--- a/editor/editor_properties.h
+++ b/editor/editor_properties.h
@@ -378,7 +378,7 @@ protected:
 
 public:
 	virtual void update_property() override;
-	void setup(int64_t p_min, int64_t p_max, int64_t p_step, bool p_allow_greater, bool p_allow_lesser, const String &p_suffix = String());
+	void setup(int64_t p_min, int64_t p_max, int64_t p_step, bool p_hide_slider, bool p_allow_greater, bool p_allow_lesser, const String &p_suffix = String());
 	EditorPropertyInteger();
 };
 
@@ -566,7 +566,7 @@ protected:
 
 public:
 	virtual void update_property() override;
-	void setup(int p_min, int p_max, bool p_hide_slider, bool p_link = false, const String &p_suffix = String());
+	void setup(int p_min, int p_max, bool p_link = false, const String &p_suffix = String());
 	EditorPropertyVector2i(bool p_force_wide = false);
 };
 
@@ -583,7 +583,7 @@ protected:
 
 public:
 	virtual void update_property() override;
-	void setup(int p_min, int p_max, bool p_hide_slider, const String &p_suffix = String());
+	void setup(int p_min, int p_max, const String &p_suffix = String());
 	EditorPropertyRect2i(bool p_force_wide = false);
 };
 
@@ -608,7 +608,7 @@ protected:
 
 public:
 	virtual void update_property() override;
-	void setup(int p_min, int p_max, bool p_hide_slider, bool p_link = false, const String &p_suffix = String());
+	void setup(int p_min, int p_max, bool p_link = false, const String &p_suffix = String());
 	EditorPropertyVector3i(bool p_force_wide = false);
 };
 
@@ -693,7 +693,7 @@ protected:
 
 public:
 	virtual void update_property() override;
-	void setup(double p_min, double p_max, bool p_hide_slider, const String &p_suffix = String());
+	void setup(double p_min, double p_max, const String &p_suffix = String());
 	EditorPropertyVector4i();
 };
 
diff --git a/editor/editor_properties_array_dict.cpp b/editor/editor_properties_array_dict.cpp
index edda6c5d7b..451cb7cfee 100644
--- a/editor/editor_properties_array_dict.cpp
+++ b/editor/editor_properties_array_dict.cpp
@@ -919,7 +919,7 @@ void EditorPropertyDictionary::update_property() {
 				} break;
 				case Variant::INT: {
 					EditorPropertyInteger *editor = memnew(EditorPropertyInteger);
-					editor->setup(-100000, 100000, 1, true, true);
+					editor->setup(-100000, 100000, 1, false, true, true);
 					prop = editor;
 
 				} break;
@@ -942,7 +942,7 @@ void EditorPropertyDictionary::update_property() {
 				} break;
 				case Variant::VECTOR2I: {
 					EditorPropertyVector2i *editor = memnew(EditorPropertyVector2i);
-					editor->setup(-100000, 100000, true);
+					editor->setup(-100000, 100000);
 					prop = editor;
 
 				} break;
@@ -954,7 +954,7 @@ void EditorPropertyDictionary::update_property() {
 				} break;
 				case Variant::RECT2I: {
 					EditorPropertyRect2i *editor = memnew(EditorPropertyRect2i);
-					editor->setup(-100000, 100000, true);
+					editor->setup(-100000, 100000);
 					prop = editor;
 
 				} break;
@@ -966,7 +966,7 @@ void EditorPropertyDictionary::update_property() {
 				} break;
 				case Variant::VECTOR3I: {
 					EditorPropertyVector3i *editor = memnew(EditorPropertyVector3i);
-					editor->setup(-100000, 100000, true);
+					editor->setup(-100000, 100000);
 					prop = editor;
 
 				} break;
@@ -978,7 +978,7 @@ void EditorPropertyDictionary::update_property() {
 				} break;
 				case Variant::VECTOR4I: {
 					EditorPropertyVector4i *editor = memnew(EditorPropertyVector4i);
-					editor->setup(-100000, 100000, true);
+					editor->setup(-100000, 100000);
 					prop = editor;
 
 				} break;
diff --git a/editor/editor_spin_slider.cpp b/editor/editor_spin_slider.cpp
index 9128143619..60c46835fe 100644
--- a/editor/editor_spin_slider.cpp
+++ b/editor/editor_spin_slider.cpp
@@ -76,6 +76,7 @@ void EditorSpinSlider::gui_input(const Ref<InputEvent> &p_event) {
 					pre_grab_value = get_value();
 					grabbing_spinner = false;
 					grabbing_spinner_mouse_pos = get_global_mouse_position();
+					emit_signal("grabbed");
 				}
 			} else {
 				if (grabbing_spinner_attempt) {
@@ -83,6 +84,7 @@ void EditorSpinSlider::gui_input(const Ref<InputEvent> &p_event) {
 						Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_VISIBLE);
 						Input::get_singleton()->warp_mouse(grabbing_spinner_mouse_pos);
 						queue_redraw();
+						emit_signal("ungrabbed");
 					} else {
 						_focus_entered();
 					}
@@ -178,9 +180,11 @@ void EditorSpinSlider::_grabber_gui_input(const Ref<InputEvent> &p_event) {
 				grabbing_ratio = get_as_ratio();
 				grabbing_from = grabber->get_transform().xform(mb->get_position()).x;
 			}
+			emit_signal("grabbed");
 		} else {
 			grabbing_grabber = false;
 			mousewheel_over_grabber = false;
+			emit_signal("ungrabbed");
 		}
 	}
 
@@ -299,10 +303,6 @@ void EditorSpinSlider::_draw_spin_slider() {
 
 	Ref<Texture2D> updown = get_theme_icon(is_read_only() ? SNAME("updown_disabled") : SNAME("updown"), SNAME("SpinBox"));
 
-	if (get_step() == 1) {
-		number_width -= updown->get_width();
-	}
-
 	String numstr = get_text_value();
 
 	int vofs = (size.height - font->get_height(font_size)) / 2 + font->get_ascent(font_size);
@@ -359,76 +359,79 @@ void EditorSpinSlider::_draw_spin_slider() {
 	}
 	TS->free_rid(num_rid);
 
-	if (get_step() == 1) {
-		Ref<Texture2D> updown2 = get_theme_icon(is_read_only() ? SNAME("updown_disabled") : SNAME("updown"), SNAME("SpinBox"));
-		int updown_vofs = (size.height - updown2->get_height()) / 2;
-		if (rtl) {
-			updown_offset = sb->get_margin(SIDE_LEFT);
-		} else {
-			updown_offset = size.width - sb->get_margin(SIDE_RIGHT) - updown2->get_width();
-		}
-		Color c(1, 1, 1);
-		if (hover_updown) {
-			c *= Color(1.2, 1.2, 1.2);
-		}
-		draw_texture(updown2, Vector2(updown_offset, updown_vofs), c);
-		if (grabber->is_visible()) {
-			grabber->hide();
-		}
-	} else if (!hide_slider) {
-		const int grabber_w = 4 * EDSCALE;
-		const int width = size.width - sb->get_minimum_size().width - grabber_w;
-		const int ofs = sb->get_offset().x;
-		const int svofs = (size.height + vofs) / 2 - 1;
-		Color c = fc;
-
-		// Draw the horizontal slider's background.
-		c.a = 0.2;
-		draw_rect(Rect2(ofs, svofs + 1, width, 2 * EDSCALE), c);
-
-		// Draw the horizontal slider's filled part on the left.
-		const int gofs = get_as_ratio() * width;
-		c.a = 0.45;
-		draw_rect(Rect2(ofs, svofs + 1, gofs, 2 * EDSCALE), c);
-
-		// Draw the horizontal slider's grabber.
-		c.a = 0.9;
-		const Rect2 grabber_rect = Rect2(ofs + gofs, svofs, grabber_w, 4 * EDSCALE);
-		draw_rect(grabber_rect, c);
-
-		grabbing_spinner_mouse_pos = get_global_position() + grabber_rect.get_center();
-
-		bool display_grabber = (grabbing_grabber || mouse_over_spin || mouse_over_grabber) && !grabbing_spinner && !(value_input_popup && value_input_popup->is_visible());
-		if (grabber->is_visible() != display_grabber) {
-			if (display_grabber) {
-				grabber->show();
+	if (!hide_slider) {
+		if (get_step() == 1) {
+			number_width -= updown->get_width();
+			Ref<Texture2D> updown2 = get_theme_icon(is_read_only() ? SNAME("updown_disabled") : SNAME("updown"), SNAME("SpinBox"));
+			int updown_vofs = (size.height - updown2->get_height()) / 2;
+			if (rtl) {
+				updown_offset = sb->get_margin(SIDE_LEFT);
 			} else {
+				updown_offset = size.width - sb->get_margin(SIDE_RIGHT) - updown2->get_width();
+			}
+			Color c(1, 1, 1);
+			if (hover_updown) {
+				c *= Color(1.2, 1.2, 1.2);
+			}
+			draw_texture(updown2, Vector2(updown_offset, updown_vofs), c);
+			if (grabber->is_visible()) {
 				grabber->hide();
 			}
-		}
-
-		if (display_grabber) {
-			Ref<Texture2D> grabber_tex;
-			if (mouse_over_grabber) {
-				grabber_tex = get_theme_icon(SNAME("grabber_highlight"), SNAME("HSlider"));
-			} else {
-				grabber_tex = get_theme_icon(SNAME("grabber"), SNAME("HSlider"));
+		} else {
+			const int grabber_w = 4 * EDSCALE;
+			const int width = size.width - sb->get_minimum_size().width - grabber_w;
+			const int ofs = sb->get_offset().x;
+			const int svofs = (size.height + vofs) / 2 - 1;
+			Color c = fc;
+
+			// Draw the horizontal slider's background.
+			c.a = 0.2;
+			draw_rect(Rect2(ofs, svofs + 1, width, 2 * EDSCALE), c);
+
+			// Draw the horizontal slider's filled part on the left.
+			const int gofs = get_as_ratio() * width;
+			c.a = 0.45;
+			draw_rect(Rect2(ofs, svofs + 1, gofs, 2 * EDSCALE), c);
+
+			// Draw the horizontal slider's grabber.
+			c.a = 0.9;
+			const Rect2 grabber_rect = Rect2(ofs + gofs, svofs, grabber_w, 4 * EDSCALE);
+			draw_rect(grabber_rect, c);
+
+			grabbing_spinner_mouse_pos = get_global_position() + grabber_rect.get_center();
+
+			bool display_grabber = (grabbing_grabber || mouse_over_spin || mouse_over_grabber) && !grabbing_spinner && !(value_input_popup && value_input_popup->is_visible());
+			if (grabber->is_visible() != display_grabber) {
+				if (display_grabber) {
+					grabber->show();
+				} else {
+					grabber->hide();
+				}
 			}
 
-			if (grabber->get_texture() != grabber_tex) {
-				grabber->set_texture(grabber_tex);
-			}
+			if (display_grabber) {
+				Ref<Texture2D> grabber_tex;
+				if (mouse_over_grabber) {
+					grabber_tex = get_theme_icon(SNAME("grabber_highlight"), SNAME("HSlider"));
+				} else {
+					grabber_tex = get_theme_icon(SNAME("grabber"), SNAME("HSlider"));
+				}
 
-			Vector2 scale = get_global_transform_with_canvas().get_scale();
-			grabber->set_scale(scale);
-			grabber->reset_size();
-			grabber->set_position(get_global_position() + (grabber_rect.get_center() - grabber->get_size() * 0.5) * scale);
+				if (grabber->get_texture() != grabber_tex) {
+					grabber->set_texture(grabber_tex);
+				}
 
-			if (mousewheel_over_grabber) {
-				Input::get_singleton()->warp_mouse(grabber->get_position() + grabber_rect.size);
-			}
+				Vector2 scale = get_global_transform_with_canvas().get_scale();
+				grabber->set_scale(scale);
+				grabber->reset_size();
+				grabber->set_position(get_global_position() + (grabber_rect.get_center() - grabber->get_size() * 0.5) * scale);
+
+				if (mousewheel_over_grabber) {
+					Input::get_singleton()->warp_mouse(grabber->get_position() + grabber_rect.size);
+				}
 
-			grabber_range = width;
+				grabber_range = width;
+			}
 		}
 	}
 }
@@ -584,6 +587,8 @@ void EditorSpinSlider::_value_focus_exited() {
 		//enter, click, esc
 		grab_focus();
 	}
+
+	emit_signal("value_focus_exited");
 }
 
 void EditorSpinSlider::_grabber_mouse_entered() {
@@ -627,6 +632,7 @@ void EditorSpinSlider::_focus_entered() {
 	value_input->call_deferred(SNAME("select_all"));
 	value_input->set_focus_next(find_next_valid_focus()->get_path());
 	value_input->set_focus_previous(find_prev_valid_focus()->get_path());
+	emit_signal("value_focus_entered");
 }
 
 void EditorSpinSlider::_bind_methods() {
@@ -650,6 +656,11 @@ void EditorSpinSlider::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "read_only"), "set_read_only", "is_read_only");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "flat"), "set_flat", "is_flat");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "hide_slider"), "set_hide_slider", "is_hiding_slider");
+
+	ADD_SIGNAL(MethodInfo("grabbed"));
+	ADD_SIGNAL(MethodInfo("ungrabbed"));
+	ADD_SIGNAL(MethodInfo("value_focus_entered"));
+	ADD_SIGNAL(MethodInfo("value_focus_exited"));
 }
 
 void EditorSpinSlider::_ensure_input_popup() {
diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp
index de16400ec9..344a800241 100644
--- a/editor/plugins/animation_player_editor_plugin.cpp
+++ b/editor/plugins/animation_player_editor_plugin.cpp
@@ -87,13 +87,13 @@ void AnimationPlayerEditor::_notification(int p_what) {
 				}
 				frame->set_value(player->get_current_animation_position());
 				track_editor->set_anim_pos(player->get_current_animation_position());
-
 			} else if (!player->is_valid()) {
 				// Reset timeline when the player has been stopped externally
 				frame->set_value(0);
 			} else if (last_active) {
 				// Need the last frame after it stopped.
 				frame->set_value(player->get_current_animation_position());
+				track_editor->set_anim_pos(player->get_current_animation_position());
 			}
 
 			last_active = player->is_playing();
@@ -423,7 +423,7 @@ void AnimationPlayerEditor::_select_anim_by_name(const String &p_anim) {
 	_animation_selected(idx);
 }
 
-double AnimationPlayerEditor::_get_editor_step() const {
+float AnimationPlayerEditor::_get_editor_step() const {
 	// Returns the effective snapping value depending on snapping modifiers, or 0 if snapping is disabled.
 	if (track_editor->is_snap_enabled()) {
 		const String current = player->get_assigned_animation();
@@ -434,7 +434,7 @@ double AnimationPlayerEditor::_get_editor_step() const {
 		return Input::get_singleton()->is_key_pressed(Key::SHIFT) ? anim->get_step() * 0.25 : anim->get_step();
 	}
 
-	return 0.0;
+	return 0.0f;
 }
 
 void AnimationPlayerEditor::_animation_name_edited() {
@@ -1973,3 +1973,26 @@ AnimationPlayerEditorPlugin::AnimationPlayerEditorPlugin() {
 
 AnimationPlayerEditorPlugin::~AnimationPlayerEditorPlugin() {
 }
+
+// AnimationTrackKeyEditEditorPlugin
+
+bool EditorInspectorPluginAnimationTrackKeyEdit::can_handle(Object *p_object) {
+	return Object::cast_to<AnimationTrackKeyEdit>(p_object) != nullptr;
+}
+
+void EditorInspectorPluginAnimationTrackKeyEdit::parse_begin(Object *p_object) {
+	AnimationTrackKeyEdit *atk = Object::cast_to<AnimationTrackKeyEdit>(p_object);
+	ERR_FAIL_COND(!atk);
+
+	atk_editor = memnew(AnimationTrackKeyEditEditor(atk->animation, atk->track, atk->key_ofs, atk->use_fps));
+	add_custom_control(atk_editor);
+}
+
+AnimationTrackKeyEditEditorPlugin::AnimationTrackKeyEditEditorPlugin() {
+	atk_plugin = memnew(EditorInspectorPluginAnimationTrackKeyEdit);
+	EditorInspector::add_inspector_plugin(atk_plugin);
+}
+
+bool AnimationTrackKeyEditEditorPlugin::handles(Object *p_object) const {
+	return p_object->is_class("AnimationTrackKeyEdit");
+}
diff --git a/editor/plugins/animation_player_editor_plugin.h b/editor/plugins/animation_player_editor_plugin.h
index 53d460fc9e..8539d450e6 100644
--- a/editor/plugins/animation_player_editor_plugin.h
+++ b/editor/plugins/animation_player_editor_plugin.h
@@ -162,7 +162,7 @@ class AnimationPlayerEditor : public VBoxContainer {
 	} onion;
 
 	void _select_anim_by_name(const String &p_anim);
-	double _get_editor_step() const;
+	float _get_editor_step() const;
 	void _play_pressed();
 	void _play_from_pressed();
 	void _play_bw_pressed();
@@ -272,4 +272,30 @@ public:
 	~AnimationPlayerEditorPlugin();
 };
 
+// AnimationTrackKeyEditEditorPlugin
+
+class EditorInspectorPluginAnimationTrackKeyEdit : public EditorInspectorPlugin {
+	GDCLASS(EditorInspectorPluginAnimationTrackKeyEdit, EditorInspectorPlugin);
+
+	AnimationTrackKeyEditEditor *atk_editor = nullptr;
+
+public:
+	virtual bool can_handle(Object *p_object) override;
+	virtual void parse_begin(Object *p_object) override;
+};
+
+class AnimationTrackKeyEditEditorPlugin : public EditorPlugin {
+	GDCLASS(AnimationTrackKeyEditEditorPlugin, EditorPlugin);
+
+	EditorInspectorPluginAnimationTrackKeyEdit *atk_plugin = nullptr;
+
+public:
+	bool has_main_screen() const override { return false; }
+	virtual bool handles(Object *p_object) const override;
+
+	virtual String get_name() const override { return "AnimationTrackKeyEdit"; }
+
+	AnimationTrackKeyEditEditorPlugin();
+};
+
 #endif // ANIMATION_PLAYER_EDITOR_PLUGIN_H
diff --git a/editor/plugins/font_config_plugin.cpp b/editor/plugins/font_config_plugin.cpp
index 4370d013be..6b3db095d4 100644
--- a/editor/plugins/font_config_plugin.cpp
+++ b/editor/plugins/font_config_plugin.cpp
@@ -483,7 +483,7 @@ void EditorPropertyOTVariation::update_property() {
 			Vector3i range = supported.get_value_at_index(i);
 
 			EditorPropertyInteger *prop = memnew(EditorPropertyInteger);
-			prop->setup(range.x, range.y, 1, false, false);
+			prop->setup(range.x, range.y, false, 1, false, false);
 			prop->set_object_and_property(object.ptr(), "keys/" + itos(name_tag));
 
 			String name = TS->tag_to_name(name_tag);
@@ -762,7 +762,7 @@ void EditorPropertyOTFeatures::update_property() {
 					} break;
 					case Variant::INT: {
 						EditorPropertyInteger *editor = memnew(EditorPropertyInteger);
-						editor->setup(0, 255, 1, false, false);
+						editor->setup(0, 255, 1, false, false, false);
 						prop = editor;
 					} break;
 					default: {
diff --git a/editor/plugins/tiles/tile_proxies_manager_dialog.cpp b/editor/plugins/tiles/tile_proxies_manager_dialog.cpp
index b31fb1aa58..2868c14452 100644
--- a/editor/plugins/tiles/tile_proxies_manager_dialog.cpp
+++ b/editor/plugins/tiles/tile_proxies_manager_dialog.cpp
@@ -398,7 +398,7 @@ TileProxiesManagerDialog::TileProxiesManagerDialog() {
 	source_from_property_editor->connect("property_changed", callable_mp(this, &TileProxiesManagerDialog::_property_changed));
 	source_from_property_editor->set_selectable(false);
 	source_from_property_editor->set_h_size_flags(Control::SIZE_EXPAND_FILL);
-	source_from_property_editor->setup(-1, 99999, 1, true, false);
+	source_from_property_editor->setup(-1, 99999, 1, false, true, false);
 	vboxcontainer_from->add_child(source_from_property_editor);
 
 	coords_from_property_editor = memnew(EditorPropertyVector2i);
@@ -417,7 +417,7 @@ TileProxiesManagerDialog::TileProxiesManagerDialog() {
 	alternative_from_property_editor->connect("property_changed", callable_mp(this, &TileProxiesManagerDialog::_property_changed));
 	alternative_from_property_editor->set_selectable(false);
 	alternative_from_property_editor->set_h_size_flags(Control::SIZE_EXPAND_FILL);
-	alternative_from_property_editor->setup(-1, 99999, 1, true, false);
+	alternative_from_property_editor->setup(-1, 99999, 1, false, true, false);
 	alternative_from_property_editor->hide();
 	vboxcontainer_from->add_child(alternative_from_property_editor);
 
@@ -432,7 +432,7 @@ TileProxiesManagerDialog::TileProxiesManagerDialog() {
 	source_to_property_editor->connect("property_changed", callable_mp(this, &TileProxiesManagerDialog::_property_changed));
 	source_to_property_editor->set_selectable(false);
 	source_to_property_editor->set_h_size_flags(Control::SIZE_EXPAND_FILL);
-	source_to_property_editor->setup(-1, 99999, 1, true, false);
+	source_to_property_editor->setup(-1, 99999, 1, false, true, false);
 	vboxcontainer_to->add_child(source_to_property_editor);
 
 	coords_to_property_editor = memnew(EditorPropertyVector2i);
@@ -451,7 +451,7 @@ TileProxiesManagerDialog::TileProxiesManagerDialog() {
 	alternative_to_property_editor->connect("property_changed", callable_mp(this, &TileProxiesManagerDialog::_property_changed));
 	alternative_to_property_editor->set_selectable(false);
 	alternative_to_property_editor->set_h_size_flags(Control::SIZE_EXPAND_FILL);
-	alternative_to_property_editor->setup(-1, 99999, 1, true, false);
+	alternative_to_property_editor->setup(-1, 99999, 1, false, true, false);
 	alternative_to_property_editor->hide();
 	vboxcontainer_to->add_child(alternative_to_property_editor);