Merge 216052ba0d into fede2d8e6f

Merge branch 'Orama-Interactive:master' into master
Fix undo/redo not working if the cursor is over the timeline
2025-02-12 16:53:07 +00:00 · 2024-11-22 01:52:28 +00:00 · 2024-11-22 09:52:25 +08:00 · 2024-11-22 02:56:57 +02:00
1 changed files with 4 additions and 2 deletions
--- a/src/UI/Timeline/AnimationTimeline.gd
+++ b/src/UI/Timeline/AnimationTimeline.gd
@ -140,8 +140,10 @@ func _input(event: InputEvent) -> void:
 	var timeline_rect := Rect2(global_position, size)
 	if timeline_rect.has_point(mouse_pos):
 		if Input.is_key_pressed(KEY_CTRL):
-			cel_size += (2 * int(event.is_action("zoom_in")) - 2 * int(event.is_action("zoom_out")))
+			var zoom := 2 * int(event.is_action("zoom_in")) - 2 * int(event.is_action("zoom_out"))
-			get_viewport().set_input_as_handled()
+			cel_size += zoom
 			if zoom != 0:
 				get_viewport().set_input_as_handled()
 func reset_settings() -> void:
Author	SHA1	Message	Date
NIyue	b7bc1e551d	Merge `216052ba0d` into `fede2d8e6f`	2024-11-22 01:52:28 +00:00
NIyue	216052ba0d	Merge branch 'Orama-Interactive:master' into master	2024-11-22 09:52:25 +08:00
Emmanouil Papadeas	fede2d8e6f	Fix undo/redo not working if the cursor is over the timeline	2024-11-22 02:56:57 +02:00