diff options
| author | supermerill <merill@free.fr> | 2020-10-18 04:50:08 +0300 |
|---|---|---|
| committer | supermerill <merill@free.fr> | 2020-10-18 04:50:08 +0300 |
| commit | 3aaedd671bb7ad094452b60e6f17783595729cad (patch) | |
| tree | 8ec27553679b565520a9b8764fe3551380e99cd7 /src/slic3r/GUI/wxExtensions.cpp | |
| parent | 6fdd615b6efb3bdedd0d97282999c741eabc0f00 (diff) | |
| parent | bb79966ddb15b7921bfd808c89612d393b5cafa5 (diff) | |
Merge remote-tracking branch 'remotes/prusa/master' into dev
note: layer time is not working, chronology need formatting, temperature ok.
Diffstat (limited to 'src/slic3r/GUI/wxExtensions.cpp')
| -rw-r--r-- | src/slic3r/GUI/wxExtensions.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/slic3r/GUI/wxExtensions.cpp b/src/slic3r/GUI/wxExtensions.cpp index 78371c096..4a76d9c2b 100644 --- a/src/slic3r/GUI/wxExtensions.cpp +++ b/src/slic3r/GUI/wxExtensions.cpp @@ -788,10 +788,12 @@ ScalableButton::ScalableButton( wxWindow * parent, const wxSize& size /* = wxDefaultSize*/, const wxPoint& pos /* = wxDefaultPosition*/, long style /*= wxBU_EXACTFIT | wxNO_BORDER*/, - bool use_default_disabled_bitmap/* = false*/) : + bool use_default_disabled_bitmap/* = false*/, + int bmp_px_cnt/* = 16*/) : m_parent(parent), m_current_icon_name(icon_name), - m_use_default_disabled_bitmap (use_default_disabled_bitmap) + m_use_default_disabled_bitmap (use_default_disabled_bitmap), + m_px_cnt(bmp_px_cnt) { Create(parent, id, label, pos, size, style); #ifdef __WXMSW__ @@ -799,7 +801,7 @@ ScalableButton::ScalableButton( wxWindow * parent, SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); #endif // __WXMSW__ - SetBitmap(create_scaled_bitmap(icon_name, parent)); + SetBitmap(create_scaled_bitmap(icon_name, parent, m_px_cnt)); if (m_use_default_disabled_bitmap) SetBitmapDisabled(create_scaled_bitmap(m_current_icon_name, m_parent, m_px_cnt, true)); |