summaryrefslogtreecommitdiff
path: root/editor/project_settings.h
diff options
context:
space:
mode:
authorBojidar Marinov <bojidar.marinov.bg@gmail.com>2017-06-24 15:35:36 +0300
committerBojidar Marinov <bojidar.marinov.bg@gmail.com>2017-06-25 14:35:34 +0300
commit8804c24d82bc183e8daa938375dc204536657555 (patch)
treea317c5813cb4d7ae8f09b7e067570ca433bd4dbc /editor/project_settings.h
parent00e5ba314393ce2cc4df883bc1742306007ed117 (diff)
Allow input mappings to be edited
Closes #7312
Diffstat (limited to 'editor/project_settings.h')
-rw-r--r--editor/project_settings.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/editor/project_settings.h b/editor/project_settings.h
index 47fb45cf8e..03140a854b 100644
--- a/editor/project_settings.h
+++ b/editor/project_settings.h
@@ -55,6 +55,7 @@ class ProjectSettings : public AcceptDialog {
Timer *timer;
InputType add_type;
String add_at;
+ int edit_idx;
EditorData *data;
UndoRedo *undo_redo;
@@ -105,7 +106,8 @@ class ProjectSettings : public AcceptDialog {
void _item_del();
void _update_actions();
void _save();
- void _add_item(int p_item);
+ void _add_item(int p_item, Ref<InputEvent> p_exiting_event = NULL);
+ void _edit_item(Ref<InputEvent> p_exiting_event);
void _action_adds(String);
void _action_add();
@@ -114,6 +116,7 @@ class ProjectSettings : public AcceptDialog {
void _item_checked(const String &p_item, bool p_check);
void _action_selected();
void _action_edited();
+ void _action_activated();
void _action_button_pressed(Object *p_obj, int p_column, int p_id);
void _wait_for_key(const Ref<InputEvent> &p_event);
void _press_a_key_confirm();