From 240dc8b69755b60906919479cdb0badb179107f4 Mon Sep 17 00:00:00 2001
From: YuSanka <yusanka@gmail.com>
Date: Fri, 18 Dec 2020 11:27:28 +0100
Subject: [PATCH] Follow-up to
https://github.com/prusa3d/PrusaSlicer/commit/19b52da2603a20562dcb147e7a94a750b055d4e0:
Fixed scale for view toolbar on HDPI (GTK3 specific)
---
src/slic3r/GUI/GLCanvas3D.cpp | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
index 635709037..f78307725 100644
--- a/src/slic3r/GUI/GLCanvas3D.cpp
+++ b/src/slic3r/GUI/GLCanvas3D.cpp
@@ -5331,16 +5331,18 @@ void GLCanvas3D::_render_view_toolbar() const
{
GLToolbar& view_toolbar = wxGetApp().plater()->get_view_toolbar();
-#if __APPLE__
-// m_view_toolbar.set_scale(m_retina_helper->get_scale_factor());
+#if ENABLE_RETINA_GL
const float scale = m_retina_helper->get_scale_factor() * wxGetApp().toolbar_icon_scale();
- view_toolbar.set_scale(scale); //! #ys_FIXME_experiment
-#else
-// m_view_toolbar.set_scale(m_canvas->GetContentScaleFactor());
-// 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
+#if __APPLE__
+ view_toolbar.set_scale(scale);
+#else // if GTK3
+ const float size = int(GLGizmosManager::Default_Icons_Size * scale);
+ view_toolbar.set_icons_size(size);
#endif // __APPLE__
+#else
+ const float size = int(GLGizmosManager::Default_Icons_Size * wxGetApp().toolbar_icon_scale());
+ view_toolbar.set_icons_size(size);
+#endif // ENABLE_RETINA_GL
Size cnv_size = get_canvas_size();
float inv_zoom = (float)wxGetApp().plater()->get_camera().get_inv_zoom();