summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-10-17 10:52:50 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-10-17 10:52:50 -0300
commit52cc8e6ead1142d43449b23ef69d70ce3c9fe6a2 (patch)
treec049f52140c8cbf1a25024f1f0f31aba5edf208a
parentc22b627ee34a5849955192b18c6cbaee612a4cc0 (diff)
parentedabbcd064372ff036e01735f6b236f472d80c93 (diff)
Merge pull request #2357 from volzhs/prevent-to-change-tool-mode
prevent to change tool mode when control key is pressed
-rw-r--r--tools/editor/plugins/canvas_item_editor_plugin.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/editor/plugins/canvas_item_editor_plugin.cpp b/tools/editor/plugins/canvas_item_editor_plugin.cpp
index 8fc2945450..46badd3742 100644
--- a/tools/editor/plugins/canvas_item_editor_plugin.cpp
+++ b/tools/editor/plugins/canvas_item_editor_plugin.cpp
@@ -144,6 +144,9 @@ void CanvasItemEditor::_unhandled_key_input(const InputEvent& p_ev) {
if (!is_visible())
return;
+ if (p_ev.key.mod.control)
+ // prevent to change tool mode when control key is pressed
+ return;
if (p_ev.key.pressed && !p_ev.key.echo && p_ev.key.scancode==KEY_Q)
_tool_select(TOOL_SELECT);
if (p_ev.key.pressed && !p_ev.key.echo && p_ev.key.scancode==KEY_W)