mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-08 15:37:30 -06:00
Merge branch 'main' into enh-port-edit-gcode-dlg
# Conflicts: # src/slic3r/GUI/OG_CustomCtrl.cpp # src/slic3r/GUI/OG_CustomCtrl.hpp
This commit is contained in:
commit
f78d55eac5
265 changed files with 29219 additions and 7128 deletions
|
@ -1132,7 +1132,7 @@ void Choice::BUILD()
|
|||
auto icon_name = "param_" + m_opt.enum_values[i];
|
||||
if (boost::filesystem::exists(image_path / (icon_name + ".svg"))) {
|
||||
ScalableBitmap bm(temp, icon_name, 24);
|
||||
temp->Append(_(el), bm.get_bitmap());
|
||||
temp->Append(_(el), bm.bmp());
|
||||
} else {
|
||||
temp->Append(_(el));
|
||||
}
|
||||
|
@ -1534,7 +1534,7 @@ void Choice::msw_rescale()
|
|||
auto icon_name = "param_" + m_opt.enum_values[i];
|
||||
if (boost::filesystem::exists(image_path / (icon_name + ".svg"))) {
|
||||
ScalableBitmap bm(window, icon_name, 24);
|
||||
temp->SetItemBitmap(i, bm.get_bitmap());
|
||||
temp->SetItemBitmap(i, bm.bmp());
|
||||
}
|
||||
++i;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue