3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sidebar: Use CallAfter for update of the PresetComboBox visibility,

Browse Source 
when printer technology is changed during a project loading AND/OR switching the application mode.
Otherwise, some of PresetComboBoxes are invisible
This commit is contained in:
YuSanka 2023-01-24 11:22:01 +01:00
parent fdcfae18db
commit d327a6b2ab
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -702,10 +702,8 @@ void Sidebar::priv::show_preset_comboboxes()
for (size_t i = 0; i < 4; ++i) for (size_t i = 0; i < 4; ++i)
sizer_presets->Show(i, !showSLA); sizer_presets->Show(i, !showSLA);
for (size_t i = 4; i < 8; ++i) { for (size_t i = 4; i < 8; ++i)
if (sizer_presets->IsShown(i) != showSLA) sizer_presets->Show(i, showSLA);
sizer_presets->Show(i, showSLA);
}
frequently_changed_parameters->Show(!showSLA); frequently_changed_parameters->Show(!showSLA);
@ -819,8 +817,11 @@ Sidebar::Sidebar(Plater *parent)
auto *sizer_presets = this->p->sizer_presets; auto *sizer_presets = this->p->sizer_presets;
auto *sizer_filaments = this->p->sizer_filaments; auto *sizer_filaments = this->p->sizer_filaments;
// Hide controls, which will be shown/hidden in respect to the printer technology
text->Show(preset_type == Preset::TYPE_PRINTER);
sizer_presets->Add(text, 0, wxALIGN_LEFT | wxEXPAND | wxRIGHT, 4); sizer_presets->Add(text, 0, wxALIGN_LEFT | wxEXPAND | wxRIGHT, 4);
if (! filament) { if (! filament) {
combo_and_btn_sizer->ShowItems(preset_type == Preset::TYPE_PRINTER);
sizer_presets->Add(combo_and_btn_sizer, 0, wxEXPAND | sizer_presets->Add(combo_and_btn_sizer, 0, wxEXPAND |
#ifdef __WXGTK3__ #ifdef __WXGTK3__
wxRIGHT, margin_5); wxRIGHT, margin_5);
@ -835,6 +836,7 @@ Sidebar::Sidebar(Plater *parent)
wxBOTTOM, 1); wxBOTTOM, 1);
#endif // __WXGTK3__ #endif // __WXGTK3__
(*combo)->set_extruder_idx(0); (*combo)->set_extruder_idx(0);
sizer_filaments->ShowItems(false);
sizer_presets->Add(sizer_filaments, 1, wxEXPAND); sizer_presets->Add(sizer_filaments, 1, wxEXPAND);
} }
}; };
@ -1087,7 +1089,10 @@ void Sidebar::update_presets(Preset::Type preset_type)
case Preset::TYPE_PRINTER: case Preset::TYPE_PRINTER:
{ {
update_all_preset_comboboxes(); update_all_preset_comboboxes();
p->show_preset_comboboxes(); // CallAfter is really needed here to correct layout of the preset comboboxes,
// when printer technology is changed during a project loading AND/OR switching the application mode.
// Otherwise, some of comboboxes are invisible
CallAfter([this]() { p->show_preset_comboboxes(); });
break; break;
} }