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

Fixed of the warnings.

Browse source 
+ Some small bug-fixing related to the system colors change on MacOS ("Set..." buttons didn't respect to the system color change)
This commit is contained in:
YuSanka 2021-07-19 15:46:50 +02:00
parent d3ddb1cfa8
commit 888a5e3084
7 changed files with 16 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -889,6 +889,8 @@ bool ScalableButton::SetBitmap_(const std::string& bmp_name)
wxBitmap bmp = create_scaled_bitmap(m_current_icon_name, m_parent, m_px_cnt);
SetBitmap(bmp);
SetBitmapCurrent(bmp);
SetBitmapPressed(bmp);
SetBitmapFocus(bmp);
if (m_use_default_disabled_bitmap)
SetBitmapDisabled(create_scaled_bitmap(m_current_icon_name, m_parent, m_px_cnt, true));
return true;
@ -920,7 +922,11 @@ void ScalableButton::msw_rescale()
Slic3r::GUI::wxGetApp().UpdateDarkUI(this, m_has_border);
if (!m_current_icon_name.empty()) {
SetBitmap(create_scaled_bitmap(m_current_icon_name, m_parent, m_px_cnt));
wxBitmap bmp = create_scaled_bitmap(m_current_icon_name, m_parent, m_px_cnt);
SetBitmap(bmp);
SetBitmapCurrent(bmp);
SetBitmapPressed(bmp);
SetBitmapFocus(bmp);
if (!m_disabled_icon_name.empty())
SetBitmapDisabled(create_scaled_bitmap(m_disabled_icon_name, m_parent, m_px_cnt));
else if (m_use_default_disabled_bitmap)