huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-02-07 19:09:50 +00:00
Code Issues Wiki Activity

remove some lines that appeared

Browse source 
during resolving conflicts
This commit is contained in:
Variable 2023-05-18 16:18:01 +05:00 committed by GitHub
parent 9d03cc9545
commit 1c952c50df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/UI/Timeline/AnimationTimeline.gd
View file

@ -196,8 +196,7 @@ func add_frame() -> void:
project.undo_redo.add_do_method(project, "change_cel", project.current_frame + 1)
project.undo_redo.add_undo_method(project, "change_cel", project.current_frame)
project.undo_redo.commit_action()
# it doesn't update properly without yields
# it doesn't update properly without yields
yield(get_tree(), "idle_frame")
yield(get_tree(), "idle_frame")
adjust_scroll_container()
@ -268,7 +267,6 @@ func delete_frames(indices := []) -> void:
project.undo_redo.add_do_method(Global, "undo_or_redo", false)
project.undo_redo.add_undo_method(Global, "undo_or_redo", true)
project.undo_redo.commit_action()
# it doesn't update properly without yields
yield(get_tree(), "idle_frame")
yield(get_tree(), "idle_frame")
@ -287,6 +285,7 @@ func _on_CopyFrame_pressed() -> void:
func copy_frames(indices := [], destination := -1) -> void:
var project: Project = Global.current_project
if indices.size() == 0:
indices.append(project.current_frame)
@ -296,6 +295,7 @@ func copy_frames(indices := [], destination := -1) -> void:
copied_indices = range(destination + 1, (destination + 1) + indices.size())
else:
copied_indices = range(indices[-1] + 1, indices[-1] + 1 + indices.size())
var new_animation_tags := project.animation_tags.duplicate()
# Loop through the tags to create new classes for them, so that they won't be the same
# as project.animation_tags's classes. Needed for undo/redo to work properly.
@ -306,8 +306,10 @@ func copy_frames(indices := [], destination := -1) -> void:
new_animation_tags[i].from,
new_animation_tags[i].to
)
project.undos += 1
project.undo_redo.create_action("Add Frame")
for f in indices:
var new_frame := Frame.new()
copied_frames.append(new_frame)