GitHub-Proxy/OrcaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-02 04:50:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
enricoturri1966 2021-01-13 10:46:11 +01:00
commit bda43e4482
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/PrusaSlicer.cpp
View File

@ -28,6 +28,7 @@
#include <boost/nowide/cenv.hpp> #include <boost/nowide/cenv.hpp>
#include <boost/nowide/iostream.hpp> #include <boost/nowide/iostream.hpp>
#include <boost/nowide/integration/filesystem.hpp> #include <boost/nowide/integration/filesystem.hpp>
#include <boost/dll/runtime_symbol_info.hpp>
#include "unix/fhs.hpp" // Generated by CMake from ../platform/unix/fhs.hpp.in #include "unix/fhs.hpp" // Generated by CMake from ../platform/unix/fhs.hpp.in
@ -594,7 +595,9 @@ bool CLI::setup(int argc, char **argv)
} }
} }
boost::filesystem::path path_to_binary = boost::filesystem::system_complete(argv[0]); // See Invoking prusa-slicer from $PATH environment variable crashes #5542
// boost::filesystem::path path_to_binary = boost::filesystem::system_complete(argv[0]);
boost::filesystem::path path_to_binary = boost::dll::program_location();
// Path from the Slic3r binary to its resources. // Path from the Slic3r binary to its resources.
#ifdef __APPLE__ #ifdef __APPLE__

4
src/slic3r/GUI/PresetComboBoxes.cpp
View File

@ -887,9 +887,13 @@ void PlaterPresetComboBox::update()
if (!tooltip.IsEmpty()) if (!tooltip.IsEmpty())
SetToolTip(tooltip); SetToolTip(tooltip);
#ifdef __WXMSW__
// Use this part of code just on Windows to avoid of some layout issues on Linux
// see https://github.com/prusa3d/PrusaSlicer/issues/5163 and https://github.com/prusa3d/PrusaSlicer/issues/5505
// Update control min size after rescale (changed Display DPI under MSW) // Update control min size after rescale (changed Display DPI under MSW)
if (GetMinWidth() != 20 * m_em_unit) if (GetMinWidth() != 20 * m_em_unit)
SetMinSize(wxSize(20 * m_em_unit, GetSize().GetHeight())); SetMinSize(wxSize(20 * m_em_unit, GetSize().GetHeight()));
#endif //__WXMSW__
} }
void PlaterPresetComboBox::msw_rescale() void PlaterPresetComboBox::msw_rescale()