From 127a78d953bcfcc5d617a42520eae9dc68db96ac Mon Sep 17 00:00:00 2001
From: YuSanka <yusanka@gmail.com>
Date: Fri, 26 Apr 2019 13:07:31 +0200
Subject: [PATCH] Fixed default font for legends in respect to the OS

---
 src/slic3r/GUI/GLCanvas3D.cpp | 21 ++++++++++++++-------
 src/slic3r/GUI/GLCanvas3D.hpp |  2 +-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
index 649302341..bfa4a8ed6 100644
--- a/src/slic3r/GUI/GLCanvas3D.cpp
+++ b/src/slic3r/GUI/GLCanvas3D.cpp
@@ -794,10 +794,15 @@ bool GLCanvas3D::WarningTexture::_generate(const std::string& msg_utf8, const GL
     wxString msg = GUI::from_u8(msg_utf8);
 
     wxMemoryDC memDC;
+
+#ifdef __WXMSW__
+    // set scaled application normal font as default font 
+    wxFont font = wxGetApp().normal_font();
+#else
     // select default font
     const float scale = canvas.get_canvas_size().get_scale_factor();
-//     wxFont font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).Scale(scale);
-    wxFont font = wxGetApp().normal_font();//! #ys_FIXME_experiment
+    wxFont font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).Scale(scale);
+#endif
 
     font.MakeLarger();
     font.MakeBold();
@@ -899,7 +904,7 @@ void GLCanvas3D::WarningTexture::render(const GLCanvas3D& canvas) const
     }
 }
 
-void GLCanvas3D::WarningTexture::rescale(const GLCanvas3D& canvas)
+void GLCanvas3D::WarningTexture::msw_rescale(const GLCanvas3D& canvas)
 {
     if (m_msg_text.empty())
         return;
@@ -976,14 +981,16 @@ bool GLCanvas3D::LegendTexture::generate(const GCodePreviewData& preview_data, c
     const int scaled_square_contour = Px_Square_Contour * scale;
     const int scaled_border = Px_Border * scale;
 
-    // select default font
-//     wxFont font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).Scale(scale_gl);
-    wxFont font = wxGetApp().normal_font();//! #ys_FIXME_experiment
 #ifdef __WXMSW__
+    // set scaled application normal font as default font 
+    wxFont font = wxGetApp().normal_font();
+
     // Disabling ClearType works, but the font returned is very different (much thicker) from the default.
 //    msw_disable_cleartype(font);
     bool cleartype = is_font_cleartype(font);
 #else
+    // select default font
+    wxFont font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).Scale(scale_gl);
     bool cleartype = false;
 #endif /* __WXMSW__ */
 
@@ -3190,7 +3197,7 @@ double GLCanvas3D::get_size_proportional_to_max_bed_size(double factor) const
 
 void GLCanvas3D::msw_rescale()
 {
-    m_warning_texture.rescale(*this);
+    m_warning_texture.msw_rescale(*this);
 }
 
 bool GLCanvas3D::_is_shown_on_screen() const
diff --git a/src/slic3r/GUI/GLCanvas3D.hpp b/src/slic3r/GUI/GLCanvas3D.hpp
index 45b5a58e7..8abc0378e 100644
--- a/src/slic3r/GUI/GLCanvas3D.hpp
+++ b/src/slic3r/GUI/GLCanvas3D.hpp
@@ -354,7 +354,7 @@ private:
         void render(const GLCanvas3D& canvas) const;
 
         // function used to get an information for rescaling of the warning
-        void rescale(const GLCanvas3D& canvas);
+        void msw_rescale(const GLCanvas3D& canvas);
 
     private:
         static const unsigned char Background_Color[3];