diff --git a/project.godot b/project.godot index 00f6dd206..43397cf5b 100644 --- a/project.godot +++ b/project.godot @@ -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) ] } -confirm={ +transformation_confirm={ "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) , 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, "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) ] diff --git a/src/Autoload/Global.gd b/src/Autoload/Global.gd index 97ae9b6c0..d5938ab74 100644 --- a/src/Autoload/Global.gd +++ b/src/Autoload/Global.gd @@ -288,8 +288,6 @@ func _initialize_keychain() -> void: "camera_up": Keychain.InputAction.new("", "General"), "camera_down": 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"), "go_to_first_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_subtract": 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_grid": Keychain.InputAction.new("", "Transformation tools", false), "transform_move_selection_only": diff --git a/src/Tools/SelectionTools/PolygonSelect.gd b/src/Tools/SelectionTools/PolygonSelect.gd index 9a81c8de9..d5d722b58 100644 --- a/src/Tools/SelectionTools/PolygonSelect.gd +++ b/src/Tools/SelectionTools/PolygonSelect.gd @@ -18,7 +18,7 @@ func _input(event: InputEvent) -> void: _ready_to_apply = true apply_selection(Vector2.ZERO) # Argument doesn't matter else: - if event.is_action_pressed("cancel") and _ongoing_selection: + if event.is_action_pressed("transformation_cancel") and _ongoing_selection: _ongoing_selection = false _draw_points.clear() _ready_to_apply = false diff --git a/src/UI/Canvas/Selection.gd b/src/UI/Canvas/Selection.gd index 5d35758c5..67ae1c837 100644 --- a/src/UI/Canvas/Selection.gd +++ b/src/UI/Canvas/Selection.gd @@ -82,9 +82,9 @@ func _ready() -> void: func _input(event: InputEvent) -> void: if is_moving_content: - if Input.is_action_just_pressed("confirm"): + if Input.is_action_just_pressed("transformation_confirm"): transform_content_confirm() - elif Input.is_action_just_pressed("cancel"): + elif Input.is_action_just_pressed("transformation_cancel"): transform_content_cancel() if event is InputEventKey: