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

Fix crash when dropping frames to re-arrange them

Browse source 
Also don't allow dropping on a selected frame
This commit is contained in:
Emmanouil Papadeas 2024-04-14 16:03:22 +03:00
parent 0d375631b8
commit 4ddcf37d0b
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/UI/Timeline/FrameButton.gd
View file

@ -116,9 +116,10 @@ func _can_drop_data(_pos: Vector2, data) -> bool:
return false
var drop_frames: PackedInt32Array = data[1]
# Can't move to same frame
if drop_frames[-1] == frame:
Global.animation_timeline.drag_highlight.visible = false
return false
for drop_frame in drop_frames:
if drop_frame == frame:
Global.animation_timeline.drag_highlight.visible = false
return false
var region: Rect2
if Input.is_action_pressed("ctrl") and drop_frames.size() == 1: # Swap frames
region = get_global_rect()
@ -146,8 +147,9 @@ func _drop_data(_pos: Vector2, data) -> void:
to_frame = frame
else: # Right
to_frame = frame + 1
if drop_frames[-1] < frame:
to_frame -= drop_frames.size()
for drop_frame in drop_frames:
if drop_frame < frame:
to_frame -= 1
var to_frames := range(to_frame, to_frame + drop_frames.size())
project.undo_redo.add_do_method(project.move_frames.bind(drop_frames, to_frames))
project.undo_redo.add_undo_method(project.move_frames.bind(to_frames, drop_frames))