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

Skip keyframe creation dialog when holding Shift in the animation editor

Browse Source 
The editor setting to always bypass the confirmation dialog was removed,
since the new shortcut effectively supersedes it in a more granular way.
This commit is contained in:
Hugo Locurcio 2021-11-02 22:33:46 +01:00
parent 851bc640dd
commit 5e117ee7bf
No known key found for this signature in database
GPG Key ID: 39E8F8BE30B0A49C
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/classes/EditorSettings.xml
View File

@ -387,9 +387,6 @@
<member name="editors/animation/autorename_animation_tracks" type="bool" setter="" getter=""> <member name="editors/animation/autorename_animation_tracks" type="bool" setter="" getter="">
If [code]true[/code], automatically updates animation tracks' target paths when renaming or reparenting nodes in the Scene tree dock. If [code]true[/code], automatically updates animation tracks' target paths when renaming or reparenting nodes in the Scene tree dock.
</member> </member>
<member name="editors/animation/confirm_insert_track" type="bool" setter="" getter="">
If [code]true[/code], display a confirmation dialog when adding a new track to an animation by pressing the "key" icon next to a property.
</member>
<member name="editors/animation/default_create_bezier_tracks" type="bool" setter="" getter=""> <member name="editors/animation/default_create_bezier_tracks" type="bool" setter="" getter="">
If [code]true[/code], create a Bezier track instead of a standard track when pressing the "key" icon next to a property. Bezier tracks provide more control over animation curves, but are more difficult to adjust quickly. If [code]true[/code], create a Bezier track instead of a standard track when pressing the "key" icon next to a property. Bezier tracks provide more control over animation curves, but are more difficult to adjust quickly.
</member> </member>

8
editor/animation_track_editor.cpp
View File

@ -3632,13 +3632,15 @@ void AnimationTrackEditor::commit_insert_queue() {
} }
} }
if (bool(EDITOR_GET("editors/animation/confirm_insert_track")) && num_tracks > 0) { // Skip the confirmation dialog if the user holds Shift while clicking the key icon.
if (!Input::get_singleton()->is_key_pressed(Key::SHIFT) && num_tracks > 0) {
String shortcut_hint = TTR("Hold Shift when clicking the key icon to skip this dialog.");
// Potentially a new key, does not exist. // Potentially a new key, does not exist.
if (num_tracks == 1) { if (num_tracks == 1) {
// TRANSLATORS: %s will be replaced by a phrase describing the target of track. // TRANSLATORS: %s will be replaced by a phrase describing the target of track.
insert_confirm_text->set_text(vformat(TTR("Create new track for %s and insert key?"), last_track_query)); insert_confirm_text->set_text(vformat(TTR("Create new track for %s and insert key?") + "\n\n" + shortcut_hint, last_track_query));
} else { } else {
insert_confirm_text->set_text(vformat(TTR("Create %d new tracks and insert keys?"), num_tracks)); insert_confirm_text->set_text(vformat(TTR("Create %d new tracks and insert keys?") + "\n\n" + shortcut_hint, num_tracks));
} }
insert_confirm_bezier->set_visible(all_bezier); insert_confirm_bezier->set_visible(all_bezier);

1
editor/editor_settings.cpp
View File

@ -709,7 +709,6 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
// Animation // Animation
_initial_set("editors/animation/autorename_animation_tracks", true); _initial_set("editors/animation/autorename_animation_tracks", true);
_initial_set("editors/animation/confirm_insert_track", true);
_initial_set("editors/animation/default_create_bezier_tracks", false); _initial_set("editors/animation/default_create_bezier_tracks", false);
_initial_set("editors/animation/default_create_reset_tracks", true); _initial_set("editors/animation/default_create_reset_tracks", true);
_initial_set("editors/animation/onion_layers_past_color", Color(1, 0, 0)); _initial_set("editors/animation/onion_layers_past_color", Color(1, 0, 0));