mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: Blank page appears when editing presets 

Jira: 5563

Change-Id: I4c49e05515b1beff55991e92f8079c4499c27eab
This commit is contained in:
maosheng.wei 2023-12-13 17:20:29 +08:00 committed by Lane.Wei
parent ea0b202a63
commit 46bb31f7b2
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/slic3r/GUI/CreatePresetsDialog.cpp
View File

@ -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()

3
src/slic3r/GUI/Plater.cpp
View File

@ -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()