summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarynate <mary.w.nate@gmail.com>2014-05-06 17:38:00 +0800
committermarynate <mary.w.nate@gmail.com>2014-05-06 19:21:21 +0800
commitd3b7f4b1a7f73f3ec69157d2f400ae24b4e02896 (patch)
tree6e0f6c0e9bce82e8ef3f3b0edda08dba151400cc
parent212b8b2a0348eed9c7f2dd593fb103dc5d4af9d3 (diff)
EditorNode consume F1 key only when Shift or Command key not pressed at the same time
-rw-r--r--tools/editor/editor_node.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index 3ea09fca47..3ef523a695 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -115,7 +115,10 @@ void EditorNode::_unhandled_input(const InputEvent& p_event) {
switch(p_event.key.scancode) {
- case KEY_F1: _editor_select(3); break;
+ case KEY_F1:
+ if (!p_event.key.mod.shift && !p_event.key.mod.command)
+ _editor_select(3);
+ break;
case KEY_F2: _editor_select(0); break;
case KEY_F3: _editor_select(1); break;
case KEY_F4: _editor_select(2); break;