Skip to content

Commit

Permalink
Update so Mac-hotkeys work (#722)
Browse files Browse the repository at this point in the history
  • Loading branch information
Jowan-Spooner committed Jan 13, 2022
1 parent cee3e95 commit c4b6946
Showing 1 changed file with 18 additions and 18 deletions.
36 changes: 18 additions & 18 deletions addons/dialogic/Editor/TimelineEditor/TimelineEditor.gd
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ func _input(event):
if (event.pressed
and event.alt == false
and event.shift == false
and event.control == true
and (event.control == true or event.command == true)
and event.scancode == KEY_Z
and event.echo == false
):
Expand All @@ -181,24 +181,24 @@ func _input(event):
if (event.pressed
and event.alt == false
and event.shift == true
and event.control == true
and (event.control == true or event.command == true)
and event.scancode == KEY_Z
and event.echo == false
) or (event.pressed
and event.alt == false
and event.shift == false
and event.control == true
and (event.control == true or event.command == true)
and event.scancode == KEY_Y
and event.echo == false):
TimelineUndoRedo.redo()
indent_events()
get_tree().set_input_as_handled()
if (event is InputEventKey and event is InputEventWithModifiers and is_visible_in_tree()):
# CTRL UP
# UP
if (event.pressed
and event.alt == false
and event.shift == false
and event.control == false
and (event.control == false or event.command == false)
and event.scancode == KEY_UP
and event.echo == false
):
Expand All @@ -212,11 +212,11 @@ func _input(event):
get_tree().set_input_as_handled()


# CTRL DOWN
# DOWN
if (event.pressed
and event.alt == false
and event.shift == false
and event.control == false
and (event.control == false or event.command == false)
and event.scancode == KEY_DOWN
and event.echo == false
):
Expand All @@ -229,11 +229,11 @@ func _input(event):
select_item(next_node)
get_tree().set_input_as_handled()

# CTRL DELETE
# DELETE
if (event.pressed
and event.alt == false
and event.shift == false
and event.control == false
and (event.control == false or event.command == false)
and event.scancode == KEY_DELETE
and event.echo == false
):
Expand All @@ -249,7 +249,7 @@ func _input(event):
if (event.pressed
and event.alt == false
and event.shift == false
and event.control == true
and (event.control == true or event.command == true)
and event.scancode == KEY_T
and event.echo == false
):
Expand All @@ -268,7 +268,7 @@ func _input(event):
if (event.pressed
and event.alt == false
and event.shift == false
and event.control == true
and (event.control == true or event.command == true)
and event.scancode == KEY_A
and event.echo == false
):
Expand All @@ -280,7 +280,7 @@ func _input(event):
if (event.pressed
and event.alt == false
and event.shift == true
and event.control == true
and (event.control == true or event.command == true)
and event.scancode == KEY_A
and event.echo == false
):
Expand All @@ -292,7 +292,7 @@ func _input(event):
if (event.pressed
and event.alt == false
and event.shift == false
and event.control == true
and (event.control == true or event.command == true)
and event.scancode == KEY_C
and event.echo == false
):
Expand All @@ -303,7 +303,7 @@ func _input(event):
if (event.pressed
and event.alt == false
and event.shift == false
and event.control == true
and (event.control == true or event.command == true)
and event.scancode == KEY_V
and event.echo == false
):
Expand All @@ -323,7 +323,7 @@ func _input(event):
if (event.pressed
and event.alt == false
and event.shift == false
and event.control == true
and (event.control == true or event.command == true)
and event.scancode == KEY_X
and event.echo == false
):
Expand All @@ -338,7 +338,7 @@ func _input(event):
if (event.pressed
and event.alt == false
and event.shift == false
and event.control == true
and (event.control == true or event.command == true)
and event.scancode == KEY_D
and event.echo == false
):
Expand All @@ -358,7 +358,7 @@ func _unhandled_key_input(event):
if (event.pressed
and event.alt == true
and event.shift == false
and event.control == false
and (event.control == false or event.command == false)
and event.scancode == KEY_UP
and event.echo == false
):
Expand All @@ -372,7 +372,7 @@ func _unhandled_key_input(event):
if (event.pressed
and event.alt == true
and event.shift == false
and event.control == false
and (event.control == false or event.command == false)
and event.scancode == KEY_DOWN
and event.echo == false
):
Expand Down

0 comments on commit c4b6946

Please sign in to comment.