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

Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer

Browse source
This commit is contained in:
enricoturri1966 2020-05-25 13:55:23 +02:00
commit 13098938ac
2 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/slic3r/GUI/BitmapCache.cpp
View file

@ -284,16 +284,19 @@ wxBitmap* BitmapCache::load_svg(const std::string &bitmap_name, unsigned target_
auto it = m_map.find(folder + bitmap_key); auto it = m_map.find(folder + bitmap_key);
if (it != m_map.end()) if (it != m_map.end())
return it->second; return it->second;
else { // It's expensive to check if the bitmap exists every time, but otherwise:
// For the case, when application was started in Light mode and then switched to the Dark,
// we will never get a white bitmaps, if check m_map.find(bitmap_key)
// before boost::filesystem::exists(var(folder + bitmap_name + ".svg"))
if (!boost::filesystem::exists(var(folder + bitmap_name + ".svg"))) {
folder.clear();
it = m_map.find(bitmap_key); it = m_map.find(bitmap_key);
if (it != m_map.end()) if (it != m_map.end())
return it->second; return it->second;
} }
if (!boost::filesystem::exists(Slic3r::var(folder + bitmap_name + ".svg"))) bitmap_key = folder + bitmap_key;
folder.clear();
else
bitmap_key = folder + bitmap_key;
} }
else else
{ {

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

@ -561,8 +561,9 @@ void MainFrame::on_dpi_changed(const wxRect &suggested_rect)
wxGetApp().plater()->msw_rescale(); wxGetApp().plater()->msw_rescale();
// update Tabs // update Tabs
for (auto tab : wxGetApp().tabs_list) if (m_layout != slDlg) // Update tabs later, from the SettingsDialog, when the Settings are in the separated dialog
tab->msw_rescale(); for (auto tab : wxGetApp().tabs_list)
tab->msw_rescale();
wxMenuBar* menu_bar = this->GetMenuBar(); wxMenuBar* menu_bar = this->GetMenuBar();
for (size_t id = 0; id < menu_bar->GetMenuCount(); id++) for (size_t id = 0; id < menu_bar->GetMenuCount(); id++)
@ -1531,6 +1532,10 @@ void SettingsDialog::on_dpi_changed(const wxRect& suggested_rect)
const int& em = em_unit(); const int& em = em_unit();
const wxSize& size = wxSize(85 * em, 50 * em); const wxSize& size = wxSize(85 * em, 50 * em);
// update Tabs
for (auto tab : wxGetApp().tabs_list)
tab->msw_rescale();
SetMinSize(size); SetMinSize(size);
Fit(); Fit();
Refresh(); Refresh();