godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 19:41:11 +00:00
Code Releases Wiki Activity

Show last added action on Input Map and implement InputEvent "=="

Browse Source
This commit is contained in:
volzhs
2016-08-23 08:14:04 +09:00
parent 2cf781d3c6
commit 2e5a4cb5ca
4 changed files with 76 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tools/editor/project_settings.cpp
View File

@@ -245,7 +245,7 @@ void ProjectSettings::_device_input_add() {
undo_redo->add_undo_method(this,"_settings_changed");
undo_redo->commit_action();
_show_last_added(ie);
}
@@ -283,7 +283,34 @@ void ProjectSettings::_press_a_key_confirm() {
undo_redo->add_undo_method(this,"_settings_changed");
undo_redo->commit_action();
_show_last_added(ie);
}
void ProjectSettings::_show_last_added(const InputEvent& p_event) {
TreeItem *r = input_editor->get_root();
if (!r)
return;
r=r->get_children();
if (!r)
return;
bool found = false;
while(r){
TreeItem *child = r->get_children();
while(child){
Variant input = child->get_meta("__input");
if (p_event==input){
child->select(0);
found = true;
break;
}
child=child->get_next();
}
if (found) break;
r=r->get_next();
}
if (found) input_editor->ensure_cursor_is_visible();
}
void ProjectSettings::_wait_for_key(const InputEvent& p_event) {
@@ -543,6 +570,7 @@ void ProjectSettings::_update_actions() {
}
action->add_button(0,get_icon("Remove","EditorIcons"),2);
action->set_metadata(0,i);
action->set_meta("__input", ie);
}
}
}

2
tools/editor/project_settings.h
View File

@@ -111,7 +111,7 @@ class ProjectSettings : public AcceptDialog {
void _action_button_pressed(Object* p_obj, int p_column,int p_id);
void _wait_for_key(const InputEvent& p_event);
void _press_a_key_confirm();
void _show_last_added(const InputEvent& p_event);
void _settings_prop_edited(const String& p_name);
void _settings_changed();