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

ENH: [STUDIO-1272] handle default filament color in presetcomboxbox

Browse source 
Change-Id: Id78749db063fd222915b1aa5ad6abf47fb4294ca
This commit is contained in:
chunmao.guo 2022-11-10 15:42:11 +08:00 • committed by Lane.Wei
parent 8340e1ceec
commit 5761f8c050
5 changed files with 68 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/slic3r/GUI/Widgets/ComboBox.cpp
View file

@ -179,6 +179,13 @@ void ComboBox::SetString(unsigned int n, wxString const &value)
wxBitmap ComboBox::GetItemBitmap(unsigned int n) { return icons[n]; }
void ComboBox::SetItemBitmap(unsigned int n, wxBitmap const &bitmap)
{
if (n >= texts.size()) return;
icons[n] = bitmap;
drop.Invalidate();
}
int ComboBox::DoInsertItems(const wxArrayStringsAdapter &items,
unsigned int pos,
void ** clientData,

1
src/slic3r/GUI/Widgets/ComboBox.hpp
View file

@ -58,6 +58,7 @@ public:
void SetString(unsigned int n, wxString const &value) override;
wxBitmap GetItemBitmap(unsigned int n);
void SetItemBitmap(unsigned int n, wxBitmap const &bitmap);
protected:
virtual int DoInsertItems(const wxArrayStringsAdapter &items,