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

imgui: Fix font size and scaling on Windows

Browse source
This commit is contained in:
Vojtech Kral 2019-04-02 13:26:22 +02:00
parent ba4f0445c3
commit 1979baf619
3 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -4405,12 +4405,12 @@ void GLCanvas3D::_resize(unsigned int w, unsigned int h)
auto *imgui = wxGetApp().imgui();
imgui->set_display_size((float)w, (float)h);
const float font_size = 1.5f * wxGetApp().em_unit();
#if ENABLE_RETINA_GL
const float scaling = m_retina_helper->get_scale_factor();
imgui->set_scaling(font_size, 1.0f, m_retina_helper->get_scale_factor());
#else
const float scaling = m_canvas->GetContentScaleFactor();
imgui->set_scaling(font_size, m_canvas->GetContentScaleFactor(), 1.0f);
#endif
imgui->set_scaling(m_canvas->GetFont().GetPixelSize().y, scaling);
// ensures that this canvas is current
_set_current();