diff options
Diffstat (limited to 'editor/editor_layouts_dialog.cpp')
-rw-r--r-- | editor/editor_layouts_dialog.cpp | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/editor/editor_layouts_dialog.cpp b/editor/editor_layouts_dialog.cpp index dbd043c494..14478b1386 100644 --- a/editor/editor_layouts_dialog.cpp +++ b/editor/editor_layouts_dialog.cpp @@ -41,21 +41,20 @@ void EditorLayoutsDialog::_line_gui_input(const Ref<InputEvent> &p_event) { Ref<InputEventKey> k = p_event; if (k.is_valid()) { - - if (!k->is_pressed()) + if (!k->is_pressed()) { return; + } switch (k->get_keycode()) { case KEY_KP_ENTER: case KEY_ENTER: { - - if (get_hide_on_ok()) + if (get_hide_on_ok()) { hide(); + } ok_pressed(); set_input_as_handled(); } break; case KEY_ESCAPE: { - hide(); set_input_as_handled(); } break; @@ -64,27 +63,21 @@ void EditorLayoutsDialog::_line_gui_input(const Ref<InputEvent> &p_event) { } void EditorLayoutsDialog::_bind_methods() { - ADD_SIGNAL(MethodInfo("name_confirmed", PropertyInfo(Variant::STRING, "name"))); } void EditorLayoutsDialog::ok_pressed() { - if (layout_names->is_anything_selected()) { - Vector<int> const selected_items = layout_names->get_selected_items(); for (int i = 0; i < selected_items.size(); ++i) { - emit_signal("name_confirmed", layout_names->get_item_text(selected_items[i])); } } else if (name->is_visible() && name->get_text() != "") { - emit_signal("name_confirmed", name->get_text()); } } void EditorLayoutsDialog::_post_popup() { - ConfirmationDialog::_post_popup(); name->clear(); layout_names->clear(); @@ -93,7 +86,6 @@ void EditorLayoutsDialog::_post_popup() { config.instance(); Error err = config->load(EditorSettings::get_singleton()->get_editor_layouts_config()); if (err != OK) { - return; } @@ -101,13 +93,11 @@ void EditorLayoutsDialog::_post_popup() { config.ptr()->get_sections(&layouts); for (List<String>::Element *E = layouts.front(); E; E = E->next()) { - layout_names->add_item(**E); } } EditorLayoutsDialog::EditorLayoutsDialog() { - makevb = memnew(VBoxContainer); add_child(makevb); makevb->set_anchor_and_margin(MARGIN_LEFT, Control::ANCHOR_BEGIN, 5); @@ -133,6 +123,5 @@ EditorLayoutsDialog::EditorLayoutsDialog() { } void EditorLayoutsDialog::set_name_line_enabled(bool p_enabled) { - name->set_visible(p_enabled); } |