summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2016-06-05 23:01:05 +0200
committerRémi Verschelde <remi@verschelde.fr>2016-06-05 23:01:05 +0200
commitc1a18039c8557deb4517d2c001e35fa9bcbbea3a (patch)
tree0a6b39ac9d3417d04b0a6b7ccecbd4f779a8f686 /core
parenta0ac4293c17d08ca985a54247c73aa6cd183fe0f (diff)
parenta9779efe820e4ca62e498487d4e75e952d8b1bda (diff)
Merge pull request #5053 from Hinsbart/fix_editor_events
fix ui_* input events in Editor
Diffstat (limited to 'core')
-rw-r--r--core/input_map.cpp48
1 files changed, 24 insertions, 24 deletions
diff --git a/core/input_map.cpp b/core/input_map.cpp
index c266220541..08ee8138a3 100644
--- a/core/input_map.cpp
+++ b/core/input_map.cpp
@@ -327,56 +327,56 @@ void InputMap::load_default() {
InputEvent key;
key.type=InputEvent::KEY;
- add_action("input/ui_accept");
+ add_action("ui_accept");
key.key.scancode=KEY_RETURN;
- action_add_event("input/ui_accept",key);
+ action_add_event("ui_accept",key);
key.key.scancode=KEY_ENTER;
- action_add_event("input/ui_accept",key);
+ action_add_event("ui_accept",key);
key.key.scancode=KEY_SPACE;
- action_add_event("input/ui_accept",key);
+ action_add_event("ui_accept",key);
- add_action("input/ui_select");
+ add_action("ui_select");
key.key.scancode=KEY_SPACE;
- action_add_event("input/ui_select",key);
+ action_add_event("ui_select",key);
- add_action("input/ui_cancel");
+ add_action("ui_cancel");
key.key.scancode=KEY_ESCAPE;
- action_add_event("input/ui_cancel",key);
+ action_add_event("ui_cancel",key);
- add_action("input/ui_focus_next");
+ add_action("ui_focus_next");
key.key.scancode=KEY_TAB;
- action_add_event("input/ui_focus_next",key);
+ action_add_event("ui_focus_next",key);
- add_action("input/ui_focus_prev");
+ add_action("ui_focus_prev");
key.key.scancode=KEY_TAB;
key.key.mod.shift=true;
- action_add_event("input/ui_focus_prev",key);
+ action_add_event("ui_focus_prev",key);
key.key.mod.shift=false;
- add_action("input/ui_left");
+ add_action("ui_left");
key.key.scancode=KEY_LEFT;
- action_add_event("input/ui_left",key);
+ action_add_event("ui_left",key);
- add_action("input/ui_right");
+ add_action("ui_right");
key.key.scancode=KEY_RIGHT;
- action_add_event("input/ui_right",key);
+ action_add_event("ui_right",key);
- add_action("input/ui_up");
+ add_action("ui_up");
key.key.scancode=KEY_UP;
- action_add_event("input/ui_up",key);
+ action_add_event("ui_up",key);
- add_action("input/ui_down");
+ add_action("ui_down");
key.key.scancode=KEY_DOWN;
- action_add_event("input/ui_down",key);
+ action_add_event("ui_down",key);
- add_action("input/ui_page_up");
+ add_action("ui_page_up");
key.key.scancode=KEY_PAGEUP;
- action_add_event("input/ui_page_up",key);
+ action_add_event("ui_page_up",key);
- add_action("input/ui_page_down");
+ add_action("ui_page_down");
key.key.scancode=KEY_PAGEDOWN;
- action_add_event("input/ui_page_down",key);
+ action_add_event("ui_page_down",key);
// set("display/orientation", "landscape");