diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-11-14 10:53:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-14 10:53:40 +0100 |
| commit | 9d12b0f9580f5e008ec3befb7015df0306d46da4 (patch) | |
| tree | ae2bc0b162e9796a6803025f89fa1769ab6301d2 | |
| parent | 9ad1a167fb7f930ccfb17ea5a5e548448dd24f80 (diff) | |
| parent | 0287baf07825800ba2dc121691f01742ff7a23bd (diff) | |
Merge pull request #33608 from groud/disable_ok_button_input_settings
Disable ok button if no key is selected when adding event to an action
| -rw-r--r-- | editor/project_settings_editor.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp index 9ac775e456..0428aafe7e 100644 --- a/editor/project_settings_editor.cpp +++ b/editor/project_settings_editor.cpp @@ -445,6 +445,7 @@ void ProjectSettingsEditor::_wait_for_key(const Ref<InputEvent> &p_event) { const String str = keycode_get_string(k->get_scancode_with_modifiers()); press_a_key_label->set_text(str); + press_a_key->get_ok()->set_disabled(false); press_a_key->accept_event(); } } @@ -458,6 +459,7 @@ void ProjectSettingsEditor::_add_item(int p_item, Ref<InputEvent> p_exiting_even case INPUT_KEY: { press_a_key_label->set_text(TTR("Press a Key...")); + press_a_key->get_ok()->set_disabled(true); last_wait_for_key = Ref<InputEvent>(); press_a_key->popup_centered(Size2(250, 80) * EDSCALE); press_a_key->grab_focus(); @@ -1958,6 +1960,7 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) { l->set_align(Label::ALIGN_CENTER); l->set_margin(MARGIN_TOP, 20); l->set_anchor_and_margin(MARGIN_BOTTOM, ANCHOR_BEGIN, 30); + press_a_key->get_ok()->set_disabled(true); press_a_key_label = l; press_a_key->add_child(l); press_a_key->connect("gui_input", this, "_wait_for_key"); |