From 5b67880a9bddbf0446fa37eb3f7bdfbce45124ec Mon Sep 17 00:00:00 2001 From: Emmanouil Papadeas Date: Mon, 6 Nov 2023 02:42:33 +0200 Subject: [PATCH] Fix tool shortcuts not working with Control Addresses #935 --- src/UI/Tools/ToolButtons.gd | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/UI/Tools/ToolButtons.gd b/src/UI/Tools/ToolButtons.gd index 734b62dc8..4a0585db4 100644 --- a/src/UI/Tools/ToolButtons.gd +++ b/src/UI/Tools/ToolButtons.gd @@ -15,18 +15,12 @@ func _input(event: InputEvent) -> void: continue var t: Tools.Tool = Tools.tools[tool_name] if InputMap.has_action("right_" + t.shortcut + "_tool"): - if ( - event.is_action_pressed("right_" + t.shortcut + "_tool") - and (!event.is_command_or_control_pressed()) - ): + if event.is_action_pressed("right_" + t.shortcut + "_tool", false, true): # Shortcut for right button (with Alt) Tools.assign_tool(t.name, MOUSE_BUTTON_RIGHT) return if InputMap.has_action("left_" + t.shortcut + "_tool"): - if ( - event.is_action_pressed("left_" + t.shortcut + "_tool") - and (!event.is_command_or_control_pressed()) - ): + if event.is_action_pressed("left_" + t.shortcut + "_tool", false, true): # Shortcut for left button Tools.assign_tool(t.name, MOUSE_BUTTON_LEFT) return