From b9c94e1b129c9345f5640b337263f53af13c5b64 Mon Sep 17 00:00:00 2001 From: Laurenz Reinthaler <47503977+Schweini07@users.noreply.github.com> Date: Sat, 26 Dec 2020 20:02:08 +0100 Subject: [PATCH] Resolve conflict with remapping shortcuts (#407) --- src/UI/ToolButtons.gd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/UI/ToolButtons.gd b/src/UI/ToolButtons.gd index f3dd37648..698cf445b 100644 --- a/src/UI/ToolButtons.gd +++ b/src/UI/ToolButtons.gd @@ -27,9 +27,9 @@ func _input(event : InputEvent) -> void: if event.is_action_pressed(action): return for t in tools: # Handle tool shortcuts - if event.is_action_pressed("right_" + t[1] + "_tool"): # Shortcut for right button (with Alt) + if event.is_action_pressed("right_" + t[1] + "_tool") and !event.control: # Shortcut for right button (with Alt) Tools.assign_tool(t[0].name, BUTTON_RIGHT) - elif event.is_action_pressed("left_" + t[1] + "_tool"): # Shortcut for left button + elif event.is_action_pressed("left_" + t[1] + "_tool") and !event.control: # Shortcut for left button Tools.assign_tool(t[0].name, BUTTON_LEFT)