huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-02-07 10:59:49 +00:00
Code Issues Wiki Activity

Rename "confirm" and "cancel" input events

Browse source 
Into "transformation_confirm" and "transformation_cancel" respectively.
This commit is contained in:
Emmanouil Papadeas 2022-05-16 20:01:17 +03:00
parent 4a16700b80
commit a98424e474
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
project.godot
View file

@ -557,13 +557,13 @@ right_magic_wand_tool={
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":true,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":81,"physical_scancode":0,"unicode":0,"echo":false,"script":null) "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":true,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":81,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
] ]
} }
confirm={ transformation_confirm={
"deadzone": 0.5, "deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"physical_scancode":0,"unicode":0,"echo":false,"script":null) "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777222,"physical_scancode":0,"unicode":0,"echo":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777222,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
] ]
} }
cancel={ transformation_cancel={
"deadzone": 0.5, "deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777217,"physical_scancode":0,"unicode":0,"echo":false,"script":null) "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777217,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
] ]

4
src/Autoload/Global.gd
View file

@ -288,8 +288,6 @@ func _initialize_keychain() -> void:
"camera_up": Keychain.InputAction.new("", "General"), "camera_up": Keychain.InputAction.new("", "General"),
"camera_down": Keychain.InputAction.new("", "General"), "camera_down": Keychain.InputAction.new("", "General"),
"pan": Keychain.InputAction.new("", "General"), "pan": Keychain.InputAction.new("", "General"),
"confirm": Keychain.InputAction.new("", "General"),
"cancel": Keychain.InputAction.new("", "General"),
"switch_colors": Keychain.InputAction.new("", "Buttons"), "switch_colors": Keychain.InputAction.new("", "Buttons"),
"go_to_first_frame": Keychain.InputAction.new("", "Buttons"), "go_to_first_frame": Keychain.InputAction.new("", "Buttons"),
"go_to_last_frame": Keychain.InputAction.new("", "Buttons"), "go_to_last_frame": Keychain.InputAction.new("", "Buttons"),
@ -307,6 +305,8 @@ func _initialize_keychain() -> void:
"selection_add": Keychain.InputAction.new("", "Selection tools", false), "selection_add": Keychain.InputAction.new("", "Selection tools", false),
"selection_subtract": Keychain.InputAction.new("", "Selection tools", false), "selection_subtract": Keychain.InputAction.new("", "Selection tools", false),
"selection_intersect": Keychain.InputAction.new("", "Selection tools", false), "selection_intersect": Keychain.InputAction.new("", "Selection tools", false),
"transformation_confirm": Keychain.InputAction.new("", "Transformation tools", false),
"transformation_cancel": Keychain.InputAction.new("", "Transformation tools", false),
"transform_snap_axis": Keychain.InputAction.new("", "Transformation tools", false), "transform_snap_axis": Keychain.InputAction.new("", "Transformation tools", false),
"transform_snap_grid": Keychain.InputAction.new("", "Transformation tools", false), "transform_snap_grid": Keychain.InputAction.new("", "Transformation tools", false),
"transform_move_selection_only": "transform_move_selection_only":

2
src/Tools/SelectionTools/PolygonSelect.gd
View file

@ -18,7 +18,7 @@ func _input(event: InputEvent) -> void:
_ready_to_apply = true _ready_to_apply = true
apply_selection(Vector2.ZERO) # Argument doesn't matter apply_selection(Vector2.ZERO) # Argument doesn't matter
else: else:
if event.is_action_pressed("cancel") and _ongoing_selection: if event.is_action_pressed("transformation_cancel") and _ongoing_selection:
_ongoing_selection = false _ongoing_selection = false
_draw_points.clear() _draw_points.clear()
_ready_to_apply = false _ready_to_apply = false

4
src/UI/Canvas/Selection.gd
View file

@ -82,9 +82,9 @@ func _ready() -> void:
func _input(event: InputEvent) -> void: func _input(event: InputEvent) -> void:
if is_moving_content: if is_moving_content:
if Input.is_action_just_pressed("confirm"): if Input.is_action_just_pressed("transformation_confirm"):
transform_content_confirm() transform_content_confirm()
elif Input.is_action_just_pressed("cancel"): elif Input.is_action_just_pressed("transformation_cancel"):
transform_content_cancel() transform_content_cancel()
if event is InputEventKey: if event is InputEventKey: