1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-02-12 16:53:07 +00:00

Merge branch 'Orama-Interactive:master' into master

This commit is contained in:
NIyue 2024-11-22 09:52:25 +08:00 committed by GitHub
commit 216052ba0d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -140,8 +140,10 @@ func _input(event: InputEvent) -> void:
var timeline_rect := Rect2(global_position, size) var timeline_rect := Rect2(global_position, size)
if timeline_rect.has_point(mouse_pos): if timeline_rect.has_point(mouse_pos):
if Input.is_key_pressed(KEY_CTRL): 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: func reset_settings() -> void: