diff options
author | YuSanka <yusanka@gmail.com> | 2019-10-24 11:38:36 +0300 |
---|---|---|
committer | YuSanka <yusanka@gmail.com> | 2019-10-24 11:52:34 +0300 |
commit | 398d20c79be368eba12b44d196e5a6b0f001a45d (patch) | |
tree | 04e939006444568644e7f64df2ac3adfe8b2b22d /src/slic3r/GUI/wxExtensions.hpp | |
parent | 2a5cf689a44b4758ab7f64d233d75c9f32c08101 (diff) |
Improvements for extruder selector (added possibility to create combobox with thin icons)
Call of an update extruder selector after a change of extruder or filament color
Diffstat (limited to 'src/slic3r/GUI/wxExtensions.hpp')
-rw-r--r-- | src/slic3r/GUI/wxExtensions.hpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/slic3r/GUI/wxExtensions.hpp b/src/slic3r/GUI/wxExtensions.hpp index ce5e58a6a..0fedaee09 100644 --- a/src/slic3r/GUI/wxExtensions.hpp +++ b/src/slic3r/GUI/wxExtensions.hpp @@ -58,12 +58,13 @@ int em_unit(wxWindow* win); wxBitmap create_scaled_bitmap(wxWindow *win, const std::string& bmp_name, const int px_cnt = 16, const bool is_horizontal = false, const bool grayscale = false); -std::vector<wxBitmap*> get_extruder_color_icons(); +std::vector<wxBitmap*> get_extruder_color_icons(bool thin_icon = false); void apply_extruder_selector(wxBitmapComboBox** ctrl, wxWindow* parent, const std::string& first_item = "", wxPoint pos = wxDefaultPosition, - wxSize size = wxDefaultSize); + wxSize size = wxDefaultSize, + bool use_thin_icon = false); class wxCheckListBoxComboPopup : public wxCheckListBox, public wxComboPopup { @@ -964,13 +965,13 @@ private: TICK_CODE operator=(const TICK_CODE& other) const { TICK_CODE ret_val(other.tick, other.gcode, other.extruder); return ret_val; - } + }/* TICK_CODE& operator=(const TICK_CODE& other) { this->tick = other.tick; this->gcode = other.gcode; this->extruder = other.extruder; return *this; - } + }*/ int tick; std::string gcode; |