3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed a scale for the LegendTexture in a Preview

Browse source
This commit is contained in:
YuSanka 2019-02-06 10:55:11 +01:00
parent 46f32d091a
commit 3c83fa17cc
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3834,7 +3834,8 @@ bool GLCanvas3D::LegendTexture::generate(const GCodePreviewData& preview_data, c
wxMemoryDC mask_memDC; wxMemoryDC mask_memDC;
// calculate scaling // calculate scaling
const float scale = canvas.get_canvas_size().get_scale_factor(); // const float scale = canvas.get_canvas_size().get_scale_factor();
const float scale = wxGetApp().em_unit()*0.1; // get scale from em_unit() value, because of get_scale_factor() return 1
const int scaled_square = std::floor((float)Px_Square * scale); const int scaled_square = std::floor((float)Px_Square * scale);
const int scaled_title_offset = Px_Title_Offset * scale; const int scaled_title_offset = Px_Title_Offset * scale;
const int scaled_text_offset = Px_Text_Offset * scale; const int scaled_text_offset = Px_Text_Offset * scale;
@ -3842,7 +3843,7 @@ bool GLCanvas3D::LegendTexture::generate(const GCodePreviewData& preview_data, c
const int scaled_border = Px_Border * scale; const int scaled_border = Px_Border * scale;
// select default font // select default font
const wxFont font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).Scale(scale); const wxFont font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)/*.Scale(scale)*/; // font is no need to scale now
memDC.SetFont(font); memDC.SetFont(font);
mask_memDC.SetFont(font); mask_memDC.SetFont(font);

4
src/slic3r/GUI/GUI_App.hpp
View file

@ -80,8 +80,8 @@ class GUI_App : public wxApp
wxFont m_small_font; wxFont m_small_font;
wxFont m_bold_font; wxFont m_bold_font;
size_t m_em_unit; // "m" string width in pixels. size_t m_em_unit; // width of a "m"-symbol in pixels for current system font
// Used like a coefficient for a size setting of controls // Note: for 100% Scale m_em_unit = 10 -> it's a good enough coefficient for a size setting of controls
wxLocale* m_wxLocale{ nullptr }; wxLocale* m_wxLocale{ nullptr };