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

Fixed conflict after merge with master

Browse source
This commit is contained in:
enricoturri1966 2020-06-15 16:55:14 +02:00
commit 3982d8b51e
3 changed files with 39 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -673,7 +673,11 @@ bool MainFrame::can_reslice() const
void MainFrame::on_dpi_changed(const wxRect &suggested_rect)
{
#if ENABLE_WX_3_1_3_DPI_CHANGED_EVENT
wxGetApp().update_fonts(this);
#else
wxGetApp().update_fonts();
#endif // ENABLE_WX_3_1_3_DPI_CHANGED_EVENT
this->SetFont(this->normal_font());
/* Load default preset bitmaps before a tabpanel initialization,