3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 08:47:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed crash from start if SLA preset is selected.

Browse source 
Fixed extruder selection from ObjectList under OSX
This commit is contained in:
YuSanka 2019-11-08 11:24:57 +01:00
parent f2120c1122
commit ae4948bd94
3 changed files with 12 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/slic3r/GUI/wxExtensions.cpp
View file

@ -505,8 +505,6 @@ void apply_extruder_selector(wxBitmapComboBox** ctrl,
bool use_thin_icon/* = false*/)
{
std::vector<wxBitmap*> icons = get_extruder_color_icons(use_thin_icon);
if (icons.empty())
return;
if (!*ctrl)
*ctrl = new wxBitmapComboBox(parent, wxID_ANY, wxEmptyString, pos, size,
@ -519,6 +517,14 @@ void apply_extruder_selector(wxBitmapComboBox** ctrl,
(*ctrl)->Clear();
}
if (icons.empty() && !first_item.empty()) {
(*ctrl)->Append(_(first_item), wxNullBitmap);
return;
}
// For ObjectList we use short extruder name (just a number)
const bool use_full_item_name = dynamic_cast<Slic3r::GUI::ObjectList*>(parent) == nullptr;
int i = 0;
wxString str = _(L("Extruder"));
for (wxBitmap* bmp : icons) {
@ -528,7 +534,7 @@ void apply_extruder_selector(wxBitmapComboBox** ctrl,
++i;
}
(*ctrl)->Append(wxString::Format("%s %d", str, i), *bmp);
(*ctrl)->Append(use_full_item_name ? wxString::Format("%s %d", str, i) : std::to_string(i), *bmp);
++i;
}
(*ctrl)->SetSelection(0);