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

Fixed crash of build under OSX and Linux.

Browse source 
+ Added flag to control if application rescale is possible
This commit is contained in:
YuSanka 2019-04-16 14:06:09 +02:00
parent fc63a28481
commit 3b9803ba6e
8 changed files with 54 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/slic3r/GUI/GUI_Utils.hpp
View file

@ -67,7 +67,8 @@ public:
this->Bind(EVT_DPI_CHANGED, [this](const DpiChangedEvent &evt) {
// ->-
m_prev_scale_factor = m_scale_factor;
if (m_prev_scale_factor < 0)
reset_prev_scale_factor();
// -<-
m_scale_factor = (float)evt.dpi / (float)DPI_DEFAULT;
@ -77,10 +78,11 @@ public:
virtual ~DPIAware() {}
float scale_factor() const { return m_scale_factor; }
float prev_scale_factor() const { return m_prev_scale_factor; }
int em_unit() const { return m_em_unit; }
int font_size() const { return m_font_size; }
float scale_factor() const { return m_scale_factor; }
float prev_scale_factor() const { return m_prev_scale_factor; }
void reset_prev_scale_factor() { m_prev_scale_factor = m_scale_factor; }
int em_unit() const { return m_em_unit; }
int font_size() const { return m_font_size; }
protected: