Skip to content

Commit 2760049

Browse files
Fix content transformation not getting confirmed when changes were done to frames and layers
Also fixes issue where frame/layer copying does not copy the transformed data
1 parent 7b343cc commit 2760049

File tree

5 files changed

+11
-0
lines changed

5 files changed

+11
-0
lines changed

src/Classes/Project.gd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,7 @@ func size_changed(value : Vector2) -> void:
387387

388388

389389
func frames_changed(value : Array) -> void:
390+
Global.canvas.selection.transform_content_confirm()
390391
frames = value
391392
selected_cels.clear()
392393
remove_cel_buttons()

src/UI/Timeline/AnimationTimeline.gd

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ func _on_DeleteFrame_pressed(frame := -1) -> void:
161161

162162

163163
func _on_CopyFrame_pressed(frame := -1) -> void:
164+
Global.canvas.selection.transform_content_confirm()
164165
if frame == -1:
165166
frame = Global.current_project.current_frame
166167

@@ -272,6 +273,7 @@ func _on_AnimationTimer_timeout() -> void:
272273
$AnimationTimer.stop()
273274
return
274275

276+
Global.canvas.selection.transform_content_confirm()
275277
var fps = Global.current_project.fps
276278
if animation_forward:
277279
if Global.current_project.current_frame < last_frame:
@@ -355,23 +357,27 @@ func play_animation(play : bool, forward_dir : bool) -> void:
355357

356358

357359
func _on_NextFrame_pressed() -> void:
360+
Global.canvas.selection.transform_content_confirm()
358361
Global.current_project.selected_cels.clear()
359362
if Global.current_project.current_frame < Global.current_project.frames.size() - 1:
360363
Global.current_project.current_frame += 1
361364

362365

363366
func _on_PreviousFrame_pressed() -> void:
367+
Global.canvas.selection.transform_content_confirm()
364368
Global.current_project.selected_cels.clear()
365369
if Global.current_project.current_frame > 0:
366370
Global.current_project.current_frame -= 1
367371

368372

369373
func _on_LastFrame_pressed() -> void:
374+
Global.canvas.selection.transform_content_confirm()
370375
Global.current_project.selected_cels.clear()
371376
Global.current_project.current_frame = Global.current_project.frames.size() - 1
372377

373378

374379
func _on_FirstFrame_pressed() -> void:
380+
Global.canvas.selection.transform_content_confirm()
375381
Global.current_project.selected_cels.clear()
376382
Global.current_project.current_frame = 0
377383

@@ -399,6 +405,7 @@ func _on_BlueRedMode_toggled(button_pressed : bool) -> void:
399405
# Layer buttons
400406

401407
func add_layer(is_new := true) -> void:
408+
Global.canvas.selection.transform_content_confirm()
402409
var new_layers : Array = Global.current_project.layers.duplicate()
403410
var l := Layer.new()
404411
if !is_new: # Clone layer

src/UI/Timeline/CelButton.gd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ func _on_CelButton_resized() -> void:
4545
func _on_CelButton_pressed() -> void:
4646
var project := Global.current_project
4747
if Input.is_action_just_released("left_mouse"):
48+
Global.canvas.selection.transform_content_confirm()
4849
var change_cel := true
4950
var prev_curr_frame : int = project.current_frame
5051
var prev_curr_layer : int = project.current_layer

src/UI/Timeline/FrameButton.gd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ func _ready() -> void:
1212

1313
func _button_pressed() -> void:
1414
if Input.is_action_just_released("left_mouse"):
15+
Global.canvas.selection.transform_content_confirm()
1516
var prev_curr_frame : int = Global.current_project.current_frame
1617
if Input.is_action_pressed("shift"):
1718
var frame_diff_sign = sign(frame - prev_curr_frame)

src/UI/Timeline/LayerButton.gd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ func _on_LayerContainer_gui_input(event : InputEvent) -> void:
4949
var project := Global.current_project
5050

5151
if event is InputEventMouseButton:
52+
Global.canvas.selection.transform_content_confirm()
5253
var prev_curr_layer : int = project.current_layer
5354
if Input.is_action_pressed("shift"):
5455
var layer_diff_sign = sign(layer - prev_curr_layer)

0 commit comments

Comments
 (0)