diff options
| author | enricoturri1966 <enricoturri@seznam.cz> | 2020-12-18 11:03:45 +0300 |
|---|---|---|
| committer | enricoturri1966 <enricoturri@seznam.cz> | 2020-12-18 11:03:45 +0300 |
| commit | d791720b5e16e9cb2dd2cfda0692b72e98a0dd96 (patch) | |
| tree | a780fef89c380cf09e4173b628322b274b460236 /src | |
| parent | 156019d9d0dcbf64ac7a43aa4620f06dfadcfff3 (diff) | |
| parent | 19b52da2603a20562dcb147e7a94a750b055d4e0 (diff) | |
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
Diffstat (limited to 'src')
| -rw-r--r-- | src/slic3r/GUI/GLCanvas3D.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index ac13ec439..635709037 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -5331,7 +5331,7 @@ void GLCanvas3D::_render_view_toolbar() const { GLToolbar& view_toolbar = wxGetApp().plater()->get_view_toolbar(); -#if ENABLE_RETINA_GL +#if __APPLE__ // m_view_toolbar.set_scale(m_retina_helper->get_scale_factor()); const float scale = m_retina_helper->get_scale_factor() * wxGetApp().toolbar_icon_scale(); view_toolbar.set_scale(scale); //! #ys_FIXME_experiment @@ -5340,7 +5340,7 @@ void GLCanvas3D::_render_view_toolbar() const // m_view_toolbar.set_scale(wxGetApp().em_unit()*0.1f); const float size = int(GLGizmosManager::Default_Icons_Size * wxGetApp().toolbar_icon_scale()); view_toolbar.set_icons_size(size); //! #ys_FIXME_experiment -#endif // ENABLE_RETINA_GL +#endif // __APPLE__ Size cnv_size = get_canvas_size(); float inv_zoom = (float)wxGetApp().plater()->get_camera().get_inv_zoom(); |