juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-26 12:22:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: [STUDIO-1525] not switch preset after cancel edit dialog

Browse Source 
Change-Id: I91810298da40250e3c5def72737b2be6df764a3b
This commit is contained in:
chunmao.guo
2022-12-02 10:49:31 +08:00
committed by Lane.Wei
parent 50a5f8bddf
commit 5a6263c9f3
8 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -523,8 +523,9 @@ Sidebar::Sidebar(Plater *parent)
edit_btn->SetToolTip(_L("Click to edit preset"));
edit_btn->Bind(wxEVT_BUTTON, [this, combo_printer](wxCommandEvent)
{
p->editing_filament = 0;
combo_printer->switch_to_tab();
p->editing_filament = -1;
if (combo_printer->switch_to_tab())
p->editing_filament = 0;
});
combo_printer->edit_btn = edit_btn;
p->combo_printer = combo_printer;
@@ -741,7 +742,7 @@ Sidebar::Sidebar(Plater *parent)
}
if (p->editing_filament >= filament_count) {
p->editing_filament = 0;
p->editing_filament = -1;
}
wxGetApp().preset_bundle->set_num_filaments(filament_count);
@@ -768,7 +769,7 @@ Sidebar::Sidebar(Plater *parent)
ScalableButton* set_btn = new ScalableButton(p->m_panel_filament_title, wxID_ANY, "settings");
set_btn->SetToolTip(_L("Set filaments to use"));
set_btn->Bind(wxEVT_BUTTON, [this](wxCommandEvent &e) {
// p->editing_filament = -1;
p->editing_filament = -1;
// wxGetApp().params_dialog()->Popup();
// wxGetApp().get_tab(Preset::TYPE_FILAMENT)->restore_last_select_item();
wxGetApp().run_wizard(ConfigWizard::RR_USER, ConfigWizard::SP_FILAMENTS);
@@ -905,8 +906,9 @@ void Sidebar::init_filament_combo(PlaterPresetComboBox **combo, const int filame
PlaterPresetComboBox* combobox = (*combo);
edit_btn->Bind(wxEVT_BUTTON, [this, combobox, filament_idx](wxCommandEvent)
{
p->editing_filament = filament_idx; // sync with TabPresetComboxBox's m_filament_idx
combobox->switch_to_tab();
p->editing_filament = -1;
if (combobox->switch_to_tab())
p->editing_filament = filament_idx; // sync with TabPresetComboxBox's m_filament_idx
});
combobox->edit_btn = edit_btn;
@@ -1496,6 +1498,8 @@ bool Sidebar::show_object_list(bool show) const
return true;
}
void Sidebar::finish_param_edit() { p->editing_filament = -1; }
std::vector<PlaterPresetComboBox*>& Sidebar::combos_filament()
{
return p->combos_filament;