From 46bb31f7b29f72ee971f1148434e71e07be61d4a Mon Sep 17 00:00:00 2001 From: "maosheng.wei" Date: Wed, 13 Dec 2023 17:20:29 +0800 Subject: [PATCH] FIX: Blank page appears when editing presets Jira: 5563 Change-Id: I4c49e05515b1beff55991e92f8079c4499c27eab --- src/slic3r/GUI/CreatePresetsDialog.cpp | 13 +++++++------ src/slic3r/GUI/Plater.cpp | 3 --- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/slic3r/GUI/CreatePresetsDialog.cpp b/src/slic3r/GUI/CreatePresetsDialog.cpp index d0d549aee..c6afa5d42 100644 --- a/src/slic3r/GUI/CreatePresetsDialog.cpp +++ b/src/slic3r/GUI/CreatePresetsDialog.cpp @@ -4464,17 +4464,18 @@ void EditFilamentPresetDialog::edit_preset() return; } + EndModal(wxID_EDIT); + //Popup needs to be called before "restore_last_select_item", otherwise the page may not be updated + wxGetApp().params_dialog()->set_editing_filament_id(m_filament_id); + wxGetApp().params_dialog()->Popup(); tab->restore_last_select_item(); - wxGetApp().get_tab(need_edit_preset->type)->select_preset(need_edit_preset_name); + tab->select_preset(need_edit_preset_name); // when some preset have modified, if the printer is not need_edit_preset_name compatible printer, the preset will jump to other preset, need select again - if (!need_edit_preset->is_compatible) wxGetApp().get_tab(need_edit_preset->type)->select_preset(need_edit_preset_name); - + if (!need_edit_preset->is_compatible) tab->select_preset(need_edit_preset_name); + m_selected_printer.clear(); m_need_edit_preset_index = -1; - - wxGetApp().params_dialog()->set_editing_filament_id(m_filament_id); - EndModal(wxID_EDIT); } wxBoxSizer *EditFilamentPresetDialog::create_filament_basic_info() diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 66664d399..874aa2bc5 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -7719,9 +7719,6 @@ void Plater::priv::on_modify_filament(SimpleEvent &evt) wxGetApp().mainframe->update_side_preset_ui(); update_ui_from_settings(); sidebar->update_all_preset_comboboxes(); - if (wxID_EDIT == res) { - wxGetApp().params_dialog()->Popup(); - } } void Plater::priv::enter_gizmos_stack()