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

Follow-up of 93921dc7c8 -> Remove taskbar icon before to change it

Browse source
This commit is contained in:
enricoturri1966 2020-08-28 11:20:18 +02:00
parent 93921dc7c8
commit d07d5e36de
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/slic3r/GUI/MainFrame.cpp
View file

@ -280,7 +280,6 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_S
#if ENABLE_GCODE_VIEWER_TASKBAR_ICON #if ENABLE_GCODE_VIEWER_TASKBAR_ICON
MainFrame::~MainFrame() MainFrame::~MainFrame()
{ {
if (m_taskbar_icon != nullptr)
delete m_taskbar_icon; delete m_taskbar_icon;
} }
#endif // ENABLE_GCODE_VIEWER_TASKBAR_ICON #endif // ENABLE_GCODE_VIEWER_TASKBAR_ICON
@ -1419,8 +1418,10 @@ void MainFrame::set_mode(EMode mode)
SetIcon(wxIcon(Slic3r::var("PrusaSlicer_128px.png"), wxBITMAP_TYPE_PNG)); SetIcon(wxIcon(Slic3r::var("PrusaSlicer_128px.png"), wxBITMAP_TYPE_PNG));
#if ENABLE_GCODE_VIEWER_TASKBAR_ICON #if ENABLE_GCODE_VIEWER_TASKBAR_ICON
if (m_taskbar_icon != nullptr) if (m_taskbar_icon != nullptr) {
m_taskbar_icon->RemoveIcon();
m_taskbar_icon->SetIcon(wxIcon(Slic3r::var("PrusaSlicer_128px.png"), wxBITMAP_TYPE_PNG), "PrusaSlicer"); m_taskbar_icon->SetIcon(wxIcon(Slic3r::var("PrusaSlicer_128px.png"), wxBITMAP_TYPE_PNG), "PrusaSlicer");
}
#endif // ENABLE_GCODE_VIEWER_TASKBAR_ICON #endif // ENABLE_GCODE_VIEWER_TASKBAR_ICON
break; break;
@ -1470,8 +1471,10 @@ void MainFrame::set_mode(EMode mode)
SetIcon(wxIcon(Slic3r::var("PrusaSlicerGCodeViewer_128px.png"), wxBITMAP_TYPE_PNG)); SetIcon(wxIcon(Slic3r::var("PrusaSlicerGCodeViewer_128px.png"), wxBITMAP_TYPE_PNG));
#if ENABLE_GCODE_VIEWER_TASKBAR_ICON #if ENABLE_GCODE_VIEWER_TASKBAR_ICON
if (m_taskbar_icon != nullptr) if (m_taskbar_icon != nullptr) {
m_taskbar_icon->RemoveIcon();
m_taskbar_icon->SetIcon(wxIcon(Slic3r::var("PrusaSlicer_128px.png"), wxBITMAP_TYPE_PNG), "PrusaSlicer-GCode viewer"); m_taskbar_icon->SetIcon(wxIcon(Slic3r::var("PrusaSlicer_128px.png"), wxBITMAP_TYPE_PNG), "PrusaSlicer-GCode viewer");
}
#endif // ENABLE_GCODE_VIEWER_TASKBAR_ICON #endif // ENABLE_GCODE_VIEWER_TASKBAR_ICON
break; break;